From a9942161bfb9be413eee0290cc56be1abd710189 Mon Sep 17 00:00:00 2001 From: Sam Nyavor Date: Wed, 21 Oct 2015 16:41:37 +0000 Subject: [PATCH 1/4] Reducing minsdk to 11 --- .idea/libraries/appcompat_v7_23_1_0.xml | 12 +++ .../libraries/support_annotations_23_1_0.xml | 11 +++ .idea/libraries/support_v4_23_1_0.xml | 13 +++ .idea/runConfigurations.xml | 12 +++ MaterialShowcaseView.iml | 19 ++++ library/library.iml | 92 ++++++++++++++++++ sample/sample.iml | 97 +++++++++++++++++++ 7 files changed, 256 insertions(+) create mode 100644 .idea/libraries/appcompat_v7_23_1_0.xml create mode 100644 .idea/libraries/support_annotations_23_1_0.xml create mode 100644 .idea/libraries/support_v4_23_1_0.xml create mode 100644 .idea/runConfigurations.xml create mode 100644 MaterialShowcaseView.iml create mode 100644 library/library.iml create mode 100644 sample/sample.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..b256bb98 --- /dev/null +++ b/.idea/libraries/appcompat_v7_23_1_0.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ 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..2cf53951 --- /dev/null +++ b/.idea/libraries/support_v4_23_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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/library/library.iml b/library/library.iml new file mode 100644 index 00000000..894ecb0b --- /dev/null +++ b/library/library.iml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sample/sample.iml b/sample/sample.iml new file mode 100644 index 00000000..06da60f7 --- /dev/null +++ b/sample/sample.iml @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 25b96389e355098303462d7e67285b9a77090bed Mon Sep 17 00:00:00 2001 From: Sam Nyavor Date: Wed, 21 Oct 2015 16:43:20 +0000 Subject: [PATCH 2/4] Finalizing minsdk of 11 --- .gitignore | 1 + .idea/libraries/appcompat_v7_23_1_0.xml | 3 +++ .idea/libraries/support_v4_23_1_0.xml | 3 +++ build.gradle | 4 ++-- library/build.gradle | 4 ++-- library/library.iml | 1 + sample/build.gradle | 6 +++--- sample/sample.iml | 2 ++ 8 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index ccf2efe0..be63fe23 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ proguard/ # Log Files *.log +.idea/* diff --git a/.idea/libraries/appcompat_v7_23_1_0.xml b/.idea/libraries/appcompat_v7_23_1_0.xml index b256bb98..9901c6a4 100644 --- a/.idea/libraries/appcompat_v7_23_1_0.xml +++ b/.idea/libraries/appcompat_v7_23_1_0.xml @@ -1,5 +1,8 @@ + + + diff --git a/.idea/libraries/support_v4_23_1_0.xml b/.idea/libraries/support_v4_23_1_0.xml index 2cf53951..5bb1e4d7 100644 --- a/.idea/libraries/support_v4_23_1_0.xml +++ b/.idea/libraries/support_v4_23_1_0.xml @@ -1,5 +1,8 @@ + + + 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..a321eeac 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 11 targetSdkVersion 23 versionCode 1 versionName "1.0" diff --git a/library/library.iml b/library/library.iml index 894ecb0b..f1cb9ea6 100644 --- a/library/library.iml +++ b/library/library.iml @@ -85,6 +85,7 @@ + diff --git a/sample/build.gradle b/sample/build.gradle index 7d2a6aa4..5c2f40d5 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -4,11 +4,11 @@ apply plugin: 'com.zeroturnaround.jrebel.android' android { compileSdkVersion 23 - buildToolsVersion "23" + buildToolsVersion "23.0.1" defaultConfig { applicationId "uk.co.deanwild.materialshowcaseviewsample" - minSdkVersion 14 + minSdkVersion 11 targetSdkVersion 23 versionCode 1 versionName "1.0" @@ -23,6 +23,6 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:23.0.0' + compile 'com.android.support:appcompat-v7:23.1.0' compile project(':library') } diff --git a/sample/sample.iml b/sample/sample.iml index 06da60f7..9dd06479 100644 --- a/sample/sample.iml +++ b/sample/sample.iml @@ -85,7 +85,9 @@ + + From 4a98f55d65b57e134df5a7010cb0a7c0ad94760a Mon Sep 17 00:00:00 2001 From: Sam Nyavor Date: Wed, 21 Oct 2015 17:03:25 +0000 Subject: [PATCH 3/4] Added 9 old android --- .gitignore | 1 + library/build.gradle | 3 ++- library/library.iml | 1 + .../deanwild/materialshowcaseview/AnimationFactory.java | 9 ++++++--- sample/build.gradle | 2 +- sample/sample.iml | 1 + 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index be63fe23..43098f90 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ proguard/ # Log Files *.log .idea/* +*.iml diff --git a/library/build.gradle b/library/build.gradle index a321eeac..52209a29 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -5,7 +5,7 @@ android { buildToolsVersion "23.0.1" defaultConfig { - minSdkVersion 11 + 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 index f1cb9ea6..6ca81fea 100644 --- a/library/library.iml +++ b/library/library.iml @@ -89,5 +89,6 @@ + \ 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/sample/build.gradle b/sample/build.gradle index 5c2f40d5..22f4a21f 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -8,7 +8,7 @@ android { defaultConfig { applicationId "uk.co.deanwild.materialshowcaseviewsample" - minSdkVersion 11 + minSdkVersion 8 targetSdkVersion 23 versionCode 1 versionName "1.0" diff --git a/sample/sample.iml b/sample/sample.iml index 9dd06479..4cd7a7c5 100644 --- a/sample/sample.iml +++ b/sample/sample.iml @@ -91,6 +91,7 @@ + From 28f2743dd8e1028de8045b165fb3aaa749ea5d6f Mon Sep 17 00:00:00 2001 From: Sam Nyavor Date: Wed, 21 Oct 2015 17:53:51 +0000 Subject: [PATCH 4/4] Removed line from showcase_content --- library/src/main/res/layout/showcase_content.xml | 1 - 1 file changed, 1 deletion(-) 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 @@