diff --git a/.gitignore b/.gitignore index ccf2efe0..43098f90 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ proguard/ # Log Files *.log +.idea/* +*.iml diff --git a/.idea/libraries/appcompat_v7_23_1_0.xml b/.idea/libraries/appcompat_v7_23_1_0.xml new file mode 100644 index 00000000..9901c6a4 --- /dev/null +++ b/.idea/libraries/appcompat_v7_23_1_0.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_annotations_23_1_0.xml b/.idea/libraries/support_annotations_23_1_0.xml new file mode 100644 index 00000000..4cadb202 --- /dev/null +++ b/.idea/libraries/support_annotations_23_1_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_v4_23_1_0.xml b/.idea/libraries/support_v4_23_1_0.xml new file mode 100644 index 00000000..5bb1e4d7 --- /dev/null +++ b/.idea/libraries/support_v4_23_1_0.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 00000000..7f68460d --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/MaterialShowcaseView.iml b/MaterialShowcaseView.iml new file mode 100644 index 00000000..ba69c1b2 --- /dev/null +++ b/MaterialShowcaseView.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 62e1a982..bbd654df 100644 --- a/build.gradle +++ b/build.gradle @@ -8,9 +8,9 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:1.2.3' + classpath 'com.android.tools.build:gradle:1.3.0' // This does not break the build when Android Studio is missing the JRebel for Android plugin. - classpath 'com.zeroturnaround.jrebel.android:jr-android-gradle:0.8.+' + classpath 'com.zeroturnaround.jrebel.android:jr-android-gradle:0.8.0.76' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/library/build.gradle b/library/build.gradle index 8a509c61..52209a29 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -2,10 +2,10 @@ apply plugin: 'com.android.library' android { compileSdkVersion 23 - buildToolsVersion "23" + buildToolsVersion "23.0.1" defaultConfig { - minSdkVersion 14 + minSdkVersion 8 targetSdkVersion 23 versionCode 1 versionName "1.0" @@ -20,4 +20,5 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) + compile 'com.nineoldandroids:library:2.4.0' } diff --git a/library/library.iml b/library/library.iml new file mode 100644 index 00000000..6ca81fea --- /dev/null +++ b/library/library.iml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/library/src/main/java/uk/co/deanwild/materialshowcaseview/AnimationFactory.java b/library/src/main/java/uk/co/deanwild/materialshowcaseview/AnimationFactory.java index 7aefb353..f915021f 100644 --- a/library/src/main/java/uk/co/deanwild/materialshowcaseview/AnimationFactory.java +++ b/library/src/main/java/uk/co/deanwild/materialshowcaseview/AnimationFactory.java @@ -1,12 +1,13 @@ package uk.co.deanwild.materialshowcaseview; -import android.animation.Animator; -import android.animation.AnimatorSet; -import android.animation.ObjectAnimator; + import android.graphics.Point; import android.view.View; import android.view.animation.AccelerateDecelerateInterpolator; +import com.nineoldandroids.animation.Animator; +import com.nineoldandroids.animation.AnimatorSet; +import com.nineoldandroids.animation.ObjectAnimator; public class AnimationFactory implements IAnimationFactory{ @@ -68,6 +69,8 @@ public void onAnimationRepeat(Animator animator) { oa.start(); } + + @Override public void animateTargetToPoint(MaterialShowcaseView showcaseView, Point point) { AnimatorSet set = new AnimatorSet(); diff --git a/library/src/main/res/layout/showcase_content.xml b/library/src/main/res/layout/showcase_content.xml index efd81d63..30070513 100644 --- a/library/src/main/res/layout/showcase_content.xml +++ b/library/src/main/res/layout/showcase_content.xml @@ -17,7 +17,6 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file