Merge branch 'master' into allow_to_add_the_showcase_view_to_a_custom_parent

Conflicts:
	library/src/main/java/com/github/amlcurran/showcaseview/ShowcaseView.java

Author: martinbonnin

README.md

@@ -1,20 +1,11 @@
-ShowcaseView is deprecated
-====
-Currently, ShowcaseView is not under active development; issues cannot be opened and PRs will not be accepted.
-
-I've decided to make this decision because I want to rewrite the project from scratch with a far better API. A lot of things Google keep introducing in Android break ShowcaseView and it is too difficult to make these changes with the project in it's current form.
-
-The project is still available on Maven, see below for the instructions. Please see the new-scv branch for development of the new API.
-
-
-
 ShowcaseView
 ---
 
 The ShowcaseView (SCV) library is designed to highlight and showcase specific parts of apps to the user with a distinctive and attractive overlay. This library is great for pointing out points of interest for users, gestures, or obscure but useful items.
 
-<img src='./example@2x.png' width='270' height='480' />
-<img src='./example2@2x.png' width='270' height='480' />
+| Holo | "New style" | Material |
+| --- | --- | --- |
+| ![Holo style showcaseview](./example2@2x.png) | ![new style showcaseview](./example@2x.png) | ![Material style showcaseview](./material.png) |
 
 The library is based on the "Cling" view found in the Launcher on Ice-Cream Sandwich and Jelly Bean.
 

gradle.properties

@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-VERSION_CODE=50102
-VERSION_NAME=5.1.1-SNAPSHOT
+VERSION_CODE=50201
+VERSION_NAME=5.2.1-SNAPSHOT
 GROUP=com.github.amlcurran.showcaseview
 
 POM_DESCRIPTION=Highlight the best bits of your app to users quickly, simply, and cool...ly
@@ -29,8 +29,8 @@ POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=amlcurran
 POM_DEVELOPER_NAME=Alex Curran
 
-BUILD_TOOLS_VERSION=21.0.0
-COMPILE_SDK=21
+BUILD_TOOLS_VERSION=22.0.1
+COMPILE_SDK=23
 MIN_SDK_LIBRARY=9
 MIN_SDK_SAMPLE=11
-TARGET_SDK=21
+TARGET_SDK=23

library/build.gradle

@@ -20,7 +20,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:1.3.0'
     }
 }
 

library/src/main/java/com/github/amlcurran/showcaseview/MaterialShowcaseDrawer.java

@@ -0,0 +1,67 @@
+package com.github.amlcurran.showcaseview;
+
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
+
+public class MaterialShowcaseDrawer implements ShowcaseDrawer {
+
+    private final float radius;
+    private final Paint basicPaint;
+    private final Paint eraserPaint;
+    private int backgroundColor;
+
+    public MaterialShowcaseDrawer(Resources resources) {
+        this.radius = resources.getDimension(R.dimen.showcase_radius_material);
+        this.eraserPaint = new Paint();
+        this.eraserPaint.setColor(0xFFFFFF);
+        this.eraserPaint.setAlpha(0);
+        this.eraserPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.MULTIPLY));
+        this.eraserPaint.setAntiAlias(true);
+        this.basicPaint = new Paint();
+    }
+
+    @Override
+    public void setShowcaseColour(int color) {
+        // no-op
+    }
+
+    @Override
+    public void drawShowcase(Bitmap buffer, float x, float y, float scaleMultiplier) {
+        Canvas bufferCanvas = new Canvas(buffer);
+        bufferCanvas.drawCircle(x, y, radius, eraserPaint);
+    }
+
+    @Override
+    public int getShowcaseWidth() {
+        return (int) (radius * 2);
+    }
+
+    @Override
+    public int getShowcaseHeight() {
+        return (int) (radius * 2);
+    }
+
+    @Override
+    public float getBlockedRadius() {
+        return radius;
+    }
+
+    @Override
+    public void setBackgroundColour(int backgroundColor) {
+        this.backgroundColor = backgroundColor;
+    }
+
+    @Override
+    public void erase(Bitmap bitmapBuffer) {
+        bitmapBuffer.eraseColor(backgroundColor);
+    }
+
+    @Override
+    public void drawToCanvas(Canvas canvas, Bitmap bitmapBuffer) {
+        canvas.drawBitmap(bitmapBuffer, 0, 0, basicPaint);
+    }
+}

library/src/main/java/com/github/amlcurran/showcaseview/ShowcaseDrawer.java

@@ -19,10 +19,7 @@
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 
-/**
- * Created by curraa01 on 13/10/2013.
- */
-interface ShowcaseDrawer {
+public interface ShowcaseDrawer {
 
     void setShowcaseColour(int color);