diff --git a/build.gradle b/build.gradle
index 0366260..7b8d99a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.0.1'
+ classpath 'com.android.tools.build:gradle:1.5.0'
}
}
diff --git a/draggablepanel/build.gradle b/draggablepanel/build.gradle
index 149fbde..93f1311 100644
--- a/draggablepanel/build.gradle
+++ b/draggablepanel/build.gradle
@@ -2,8 +2,7 @@ apply plugin: 'com.android.library'
apply plugin: 'checkstyle'
dependencies {
- compile 'com.android.support:support-v4:20.0.0'
- compile 'com.nineoldandroids:library:2.4.0'
+ compile 'com.android.support:support-v4:23.1.1'
}
android {
diff --git a/draggablepanel/src/main/java/com/github/pedrovgs/DraggableView.java b/draggablepanel/src/main/java/com/github/pedrovgs/DraggableView.java
index d1b1e06..ccde123 100644
--- a/draggablepanel/src/main/java/com/github/pedrovgs/DraggableView.java
+++ b/draggablepanel/src/main/java/com/github/pedrovgs/DraggableView.java
@@ -29,7 +29,6 @@
import android.widget.RelativeLayout;
import com.github.pedrovgs.transformer.Transformer;
import com.github.pedrovgs.transformer.TransformerFactory;
-import com.nineoldandroids.view.ViewHelper;
/**
* Class created to extends a ViewGroup and simulate the YoutubeLayoutComponent
@@ -161,7 +160,7 @@ public void slideHorizontally(float slideOffset, float drawerPosition, int width
minimize();
}
setTouchEnabled(slideOffset <= MIN_SLIDE_OFFSET);
- ViewHelper.setX(this, width - Math.abs(drawerPosition));
+ ViewCompat.setX(this, width - Math.abs(drawerPosition));
}
/**
@@ -431,8 +430,8 @@ private MotionEvent cloneMotionEventWithAction(MotionEvent event, int action) {
else if (isDragViewAtTop()) {
dragView.layout(left, top, right, transformer.getOriginalHeight());
secondView.layout(left, transformer.getOriginalHeight(), right, bottom);
- ViewHelper.setY(dragView, top);
- ViewHelper.setY(secondView, transformer.getOriginalHeight());
+ ViewCompat.setY(dragView, top);
+ ViewCompat.setY(secondView, transformer.getOriginalHeight());
} else {
secondView.layout(left, transformer.getOriginalHeight(), right, bottom);
}
@@ -494,7 +493,7 @@ void changeDragViewPosition() {
* Modify secondView position to be always below dragged view.
*/
void changeSecondViewPosition() {
- ViewHelper.setY(secondView, dragView.getBottom());
+ ViewCompat.setY(secondView, dragView.getBottom());
}
/**
@@ -520,7 +519,7 @@ void changeBackgroundAlpha() {
* Modify the second view alpha based on dragged view vertical position.
*/
void changeSecondViewAlpha() {
- ViewHelper.setAlpha(secondView, 1 - getVerticalDragOffset());
+ ViewCompat.setAlpha(secondView, 1 - getVerticalDragOffset());
}
/**
@@ -533,7 +532,7 @@ void changeDragViewViewAlpha() {
if (alpha == 0) {
alpha = 1;
}
- ViewHelper.setAlpha(dragView, alpha);
+ ViewCompat.setAlpha(dragView, alpha);
}
}
@@ -541,8 +540,8 @@ void changeDragViewViewAlpha() {
* Restore view alpha to 1
*/
void restoreAlpha() {
- if (enableHorizontalAlphaEffect && ViewHelper.getAlpha(dragView) < 1) {
- ViewHelper.setAlpha(dragView, 1);
+ if (enableHorizontalAlphaEffect && ViewCompat.getAlpha(dragView) < 1) {
+ ViewCompat.setAlpha(dragView, 1);
}
}
diff --git a/draggablepanel/src/main/java/com/github/pedrovgs/transformer/ScaleTransformer.java b/draggablepanel/src/main/java/com/github/pedrovgs/transformer/ScaleTransformer.java
index e49a13e..391791a 100644
--- a/draggablepanel/src/main/java/com/github/pedrovgs/transformer/ScaleTransformer.java
+++ b/draggablepanel/src/main/java/com/github/pedrovgs/transformer/ScaleTransformer.java
@@ -15,13 +15,13 @@
*/
package com.github.pedrovgs.transformer;
+import android.support.v4.view.ViewCompat;
import android.view.View;
-import com.nineoldandroids.view.ViewHelper;
+
/**
* Transformer extension created to scale the view instead of resize it as the other
- * implementation does. This implementation is based on Nineoldanroids library to scale
- * the view.
+ * implementation does. This implementation is based on support.v4 library
*
* @author Pedro Vicente Gómez Sánchez
*/
@@ -32,23 +32,23 @@ class ScaleTransformer extends Transformer {
}
/**
- * Uses Nineoldandroids to change the scale.
+ * Uses support.v4 to change the scale.
*
* @param verticalDragOffset used to calculate the new scale.
*/
@Override public void updateScale(float verticalDragOffset) {
- ViewHelper.setScaleX(getView(), 1 - verticalDragOffset / getXScaleFactor());
- ViewHelper.setScaleY(getView(), 1 - verticalDragOffset / getYScaleFactor());
+ ViewCompat.setScaleX(getView(), 1 - verticalDragOffset / getXScaleFactor());
+ ViewCompat.setScaleY(getView(), 1 - verticalDragOffset / getYScaleFactor());
}
/**
- * Uses Nineoldandroids to change the position of the view.
+ * Uses support.v4 to change the position of the view.
*
* @param verticalDragOffset used to calculate the new position.
*/
@Override public void updatePosition(float verticalDragOffset) {
- ViewHelper.setPivotX(getView(), getView().getWidth() - getMarginRight());
- ViewHelper.setPivotY(getView(), getView().getHeight() - getMarginBottom());
+ ViewCompat.setPivotX(getView(), getView().getWidth() - getMarginRight());
+ ViewCompat.setPivotY(getView(), getView().getHeight() - getMarginBottom());
}
/**
diff --git a/draggablepanel/src/main/java/com/github/pedrovgs/transformer/Transformer.java b/draggablepanel/src/main/java/com/github/pedrovgs/transformer/Transformer.java
index 93a248c..5f51e23 100644
--- a/draggablepanel/src/main/java/com/github/pedrovgs/transformer/Transformer.java
+++ b/draggablepanel/src/main/java/com/github/pedrovgs/transformer/Transformer.java
@@ -15,9 +15,9 @@
*/
package com.github.pedrovgs.transformer;
+import android.support.v4.view.ViewCompat;
import android.view.View;
import android.widget.RelativeLayout;
-import com.nineoldandroids.view.ViewHelper;
/**
* Abstract class created to be implemented by different classes are going to change the size of a
@@ -136,7 +136,7 @@ public boolean isViewAtTop() {
public boolean isAboveTheMiddle() {
int parentHeight = parent.getHeight();
- float viewYPosition = ViewHelper.getY(view) + (view.getHeight() * 0.5f);
+ float viewYPosition = ViewCompat.getY(view) + (view.getHeight() * 0.5f);
return viewYPosition < (parentHeight * 0.5);
}
diff --git a/gradle.properties b/gradle.properties
index 3be4539..8ff9670 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ POM_LICENCE_DIST=repo
POM_DEVELOPER_ID=pedrovgs
POM_DEVELOPER_NAME=Pedro Vicente Gómez Sánchez
-ANDROID_BUILD_TOOLS_VERSION=20.0.0
-ANDROID_COMPILE_SDK_VERSION=20
+ANDROID_BUILD_TOOLS_VERSION=23.0.2
+ANDROID_COMPILE_SDK_VERSION=23
ANDROID_TARGET_SDK_VERSION=20
ANDROID_MIN_SDK=8
\ No newline at end of file
diff --git a/sample/build.gradle b/sample/build.gradle
index 047b963..8aedbeb 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -10,7 +10,7 @@ dependencies {
compile 'com.squareup.dagger:dagger:1.1.0'
compile 'com.github.pedrovgs:renderers:1.0.9'
compile 'com.google.android.gms:play-services:4.1.32'
- compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar'
+ compile 'com.android.support:appcompat-v7:23.1.1'
compile files('libs/YouTubeAndroidPlayerApi.jar')
}
diff --git a/sample/res/values/styles.xml b/sample/res/values/styles.xml
index b8a2fdb..7226130 100644
--- a/sample/res/values/styles.xml
+++ b/sample/res/values/styles.xml
@@ -2,7 +2,7 @@
-
+