Some cleaning and module renaming before developing the Radial Action.

Author: Gordi90

circulardemo/build.gradle

@@ -30,7 +30,7 @@ repositories {
 }
 
 dependencies {
-    compile project(':circulartransform')
+    compile project(':circulartools')
     compile 'com.android.support:design:22.2.0'
     compile 'com.android.support:appcompat-v7:22.2.0'
     compile 'com.android.support:cardview-v7:22.2.0'

circulartransform/.gitignore renamed to circulartools/.gitignore

@@ -14,4 +14,4 @@
 # class:
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
-#}
+#}

circulartransform/build.gradle renamed to circulartools/build.gradle

@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="hu.gordon.circulartools">
+
+    <application
+        android:allowBackup="true"
+        android:label="@string/app_name">
+
+    </application>
+
+</manifest>

circulartransform/proguard-rules.pro renamed to circulartools/proguard-rules.pro

@@ -12,7 +12,7 @@
 
 public class CircularAnimationUtils {
 
-    private static final String CLIP_RADIUS = "RevealRadius";
+    private static final String RADIUS = "Radius";
     public static final int AUTOMATIC = 0;
     public static final int MANUAL = 1;
 
@@ -88,13 +88,13 @@ public static ObjectAnimator createCircularTransform(View target, View source, i
             throw new IllegalArgumentException("View must be inside CircularFrameLayout");
         }
 
-        CircularAnimator transformLayout = (CircularAnimator) target.getParent();
+        CircularFrameLayout transformLayout = (CircularFrameLayout) target.getParent();
         transformLayout.setTarget(target);
-        transformLayout.setClipOutlines(true);
+        transformLayout.setAnimated(true);
         transformLayout.setSource(source);
         transformLayout.setCenter(centerX, centerY);
 
-        ObjectAnimator transform = ObjectAnimator.ofFloat(transformLayout, CLIP_RADIUS, startRadius, endRadius);
+        ObjectAnimator transform = ObjectAnimator.ofFloat(transformLayout, RADIUS, startRadius, endRadius);
 
         if (source == null) {
             transform.addListener(new RevealListener(target, mode));
@@ -158,7 +158,7 @@ static class RevealListener implements AnimatorListener {
         RevealListener(View target, int mode) {
             targetReference = new WeakReference<>(target);
             parentReference = new WeakReference<>((CircularFrameLayout) targetReference.get().getParent());
-            originalLayerType = ((CircularFrameLayout)target.getParent()).getLayerType();
+            originalLayerType = ((CircularFrameLayout) target.getParent()).getLayerType();
             this.mode = mode;
         }
 
@@ -167,7 +167,7 @@ public void onAnimationStart(Animator animation) {
             if (!isHWAsupported()) {
                 parentReference.get().setLayerType(View.LAYER_TYPE_SOFTWARE, null);
             }
-            if(mode == AUTOMATIC) {
+            if (mode == AUTOMATIC) {
                 targetReference.get().setVisibility(View.VISIBLE);
             }
         }
@@ -194,7 +194,7 @@ static class TransformListener extends RevealListener {
         WeakReference<View> sourceReference;
 
         TransformListener(View target, View source, int mode) {
-            super(target,mode);
+            super(target, mode);
             sourceReference = new WeakReference<>(source);
         }
 
@@ -204,7 +204,7 @@ public void onAnimationStart(Animator animation) {
             if (!isHWAsupported()) {
                 parentReference.get().setLayerType(View.LAYER_TYPE_SOFTWARE, null);
             }
-            if(mode == AUTOMATIC) {
+            if (mode == AUTOMATIC) {
                 targetReference.get().setVisibility(View.VISIBLE);
             }
         }
@@ -214,7 +214,7 @@ public void onAnimationEnd(Animator animation) {
             if (!isHWAsupported()) {
                 parentReference.get().setLayerType(originalLayerType, null);
             }
-            if(mode == AUTOMATIC) {
+            if (mode == AUTOMATIC) {
                 sourceReference.get().setVisibility(View.INVISIBLE);
             }
         }

circulartools/src/main/AndroidManifest.xml

@@ -0,0 +1,42 @@
+package hu.aut.utillib.circular.animation;
+
+
+public interface CircularAnimator {
+
+
+    /**
+     * Whether enable {@link android.graphics.Canvas} to clip
+     * outlines of the certain or not
+     *
+     * @param isAnimated Whether it's animated or not
+     * @see #setCenter(int, int)
+     * @see #setRadius(float)
+     */
+    void setAnimated(boolean isAnimated);
+
+    /**
+     * Sets central points where to start clipping
+     * certain child
+     *
+     * @param cx x point of child
+     * @param cy y point of child
+     * @see #setAnimated(boolean) (float, float)
+     * @see #setRadius(float)
+     */
+    void setCenter(int cx, int cy);
+
+    /**
+     * Used with animator to animate view clipping
+     *
+     * @param value clip radius
+     */
+    void setRadius(float value);
+
+    /**
+     * Used with animator to animate view clipping
+     *
+     * @return current radius
+     */
+    float getRadius();
+
+}

circulartransform/src/main/java/hu/aut/utillib/circular/animation/CircularAnimationUtils.java renamed to circulartools/src/main/java/hu/aut/utillib/circular/animation/CircularAnimationUtils.java

@@ -39,20 +39,23 @@ public CircularFrameLayout(Context context, AttributeSet attrs, int defStyle) {
         mRevealPath = new Path();
     }
 
+
     /**
-     * Animation target to appear
+     * Reference the target of circular animation to appear
+     *
+     * @param target View to clip outlines
      */
-    @Override
-    public void setTarget(View view) {
-        mTarget = view;
+    public void setTarget(View target) {
+        mTarget = target;
     }
 
     /**
-     * Animation target to disappear
+     * Reference the target of circular animation to disappear
+     *
+     * @param source View to clip outlines
      */
-    @Override
-    public void setSource(View view) {
-        mSource = view;
+    public void setSource(View source) {
+        mSource = source;
     }
 
     /**
@@ -65,18 +68,19 @@ public void setCenter(int centerX, int centerY) {
     }
 
     /**
-     * Flag that animation is enabled
+     * Flag that animation is enabled (so the view should use the clipping)
+     * Clipping won't work if it's not set to true
      */
     @Override
-    public void setClipOutlines(boolean clip) {
-        mClipOutlines = clip;
+    public void setAnimated(boolean isAnimated) {
+        mClipOutlines = isAnimated;
     }
 
     /**
      * Sets the clipping circle radius size. Radius won't be smaller than 1F
      */
     @Override
-    public void setRevealRadius(float radius) {
+    public void setRadius(float radius) {
         mRadius = Math.max(1F, radius);
         invalidate();
     }
@@ -85,7 +89,7 @@ public void setRevealRadius(float radius) {
      * Returns the clipping circle radius size
      */
     @Override
-    public float getRevealRadius() {
+    public float getRadius() {
         return mRadius;
     }
 
@@ -106,11 +110,8 @@ protected boolean drawChild(@NonNull Canvas canvas, @NonNull View child, long dr
                 canvas.clipPath(mRevealPath, Region.Op.DIFFERENCE);
             }
 
-
             boolean isInvalided = super.drawChild(canvas, child, drawingTime);
-
             canvas.restore();
-
             return isInvalided;
         }
 

circulartools/src/main/java/hu/aut/utillib/circular/animation/CircularAnimator.java

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">CircularTools</string>
+</resources>

circulartransform/src/main/java/hu/aut/utillib/circular/widget/CircularFrameLayout.java renamed to circulartools/src/main/java/hu/aut/utillib/circular/widget/CircularFrameLayout.java

@@ -15,20 +15,4 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-
-VERSION_NAME=1.0.1
-VERSION_CODE=2
-GROUP=com.github.ozodrukh
-
-POM_DESCRIPTION=Port of Lollipop circular reveal animation
-POM_URL=https://github.com/ozodrukh/CircularReveal
-POM_SCM_URL=https://github.com/ozodrukh/CircularReveal
-POM_SCM_CONNECTION=scm:[email protected]:ozodrukh/CircularReveal.git
-POM_SCM_DEV_CONNECTION=scm:[email protected]:ozodrukh/CircularReveal.git
-POM_LICENCE_NAME=The MIT License (MIT)
-POM_LICENCE_URL=http://opensource.org/licenses/MIT
-POM_LICENCE_DIST=repo
-POM_DEVELOPER_ID=ozodrukh
-POM_DEVELOPER_NAME=Abdullaev Ozodrukh
-POM_DEVELOPER_EMAIL=[email protected]
+# org.gradle.parallel=true

circulartools/src/main/res/values/strings.xml

@@ -1 +1 @@
-include ':circulartransform', ':circulardemo'
+include ':circulartools', ':circulardemo'