Improvement for CircularFlow (#139)

* Improvement for CircularFlow

* example removeView

Co-authored-by: Rodrigo Martin <[email protected]>

Author: rodrigomartind

constraintlayout/constraintlayout/src/main/java/androidx/constraintlayout/helper/widget/CircularFlow.java

@@ -206,6 +206,73 @@ public void addViewToCircularFlow(View view, int radius, float angle) {
         anchorReferences();
     }
 
+    /**
+     * Update radius from a view in CircularFlow. The referenced view need to be a child of the container parent.
+     * The view also need to have its id set in order to be added.
+     * @param view
+     * @param radius
+     * @return
+     */
+    public void updateRadius(View view, int radius) {
+        if (!isUpdatable(view)) {
+            Log.e("CircularFlow", "It was not possible to update radius to view with id: " + view.getId());
+            return;
+        }
+        int indexView = indexFromId(view.getId());
+        if (indexView > mRadius.length) {
+            return;
+        }
+        mRadius = getRadius();
+        mRadius[indexView] = (int) (radius * myContext.getResources().getDisplayMetrics().density);
+        anchorReferences();
+    }
+
+    /**
+     * Update angle from a view in CircularFlow. The referenced view need to be a child of the container parent.
+     * The view also need to have its id set in order to be added.
+     * @param view
+     * @param angle
+     * @return
+     */
+    public void updateAngle(View view, float angle) {
+        if (!isUpdatable(view)) {
+            Log.e("CircularFlow", "It was not possible to update angle to view with id: " + view.getId());
+            return;
+        }
+        int indexView = indexFromId(view.getId());
+        if (indexView > mAngles.length) {
+            return;
+        }
+        mAngles = getAngles();
+        mAngles[indexView] = angle;
+        anchorReferences();
+    }
+
+    /**
+     * Update angle and radius from a view in CircularFlow. The referenced view need to be a child of the container parent.
+     * The view also need to have its id set in order to be added.
+     * @param view
+     * @param radius
+     * @param angle
+     * @return
+     */
+    public void updateReference(View view, int radius, float angle) {
+        if (!isUpdatable(view)) {
+            Log.e("CircularFlow", "It was not possible to update radius and angle to view with id: " + view.getId());
+            return;
+        }
+        int indexView = indexFromId(view.getId());
+        if (getAngles().length  > indexView) {
+            mAngles = getAngles();
+            mAngles[indexView] = angle;
+        }
+        if (getRadius().length  > indexView) {
+            mRadius = getRadius();
+            mRadius[indexView] = (int) (radius * myContext.getResources().getDisplayMetrics().density);
+        }
+        anchorReferences();
+    }
+
     @Override
     public int removeView(View view) {
         int index = super.removeView(view);
@@ -361,4 +428,12 @@ public static float[] removeElementFromArray(float[] array, int index) {
         }
         return newArray;
     }
+
+    public boolean isUpdatable(View view) {
+        if (!containsId(view.getId())){
+            return false;
+        }
+        int indexView = indexFromId(view.getId());
+        return indexView != -1;
+    }
 }

constraintlayout/constraintlayout/src/main/java/androidx/constraintlayout/widget/ConstraintHelper.java

@@ -615,4 +615,15 @@ public boolean containsId(final int id) {
         }
         return result;
     }
+
+    public int indexFromId(final int id) {
+        int index = -1;
+        for(int i : mIds) {
+            index++;
+            if(i == id){
+                return index;
+            }
+        }
+        return index;
+    }
 }

projects/CarouselExperiments/app/src/main/java/androidx/constraintlayout/experiments/CircularFlowDemoActivity.kt

@@ -3,6 +3,7 @@ package androidx.constraintlayout.experiments
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.View
+import android.widget.Toast
 import androidx.constraintlayout.helper.widget.CircularFlow
 
 class CircularFlowDemoActivity : AppCompatActivity() {
@@ -14,33 +15,62 @@ class CircularFlowDemoActivity : AppCompatActivity() {
             findViewById<CircularFlow>(R.id.circularFlow).addViewToCircularFlow(
                 it, 130, 160F
             )
+            Toast.makeText(
+                it.context,
+                "addViewToCircularFlow - Radius: " + 130 + " Angle: " + 160,
+                Toast.LENGTH_SHORT
+            ).show()
         }
 
         findViewById<View>(R.id.view7).setOnClickListener {
             findViewById<CircularFlow>(R.id.circularFlow).addViewToCircularFlow(
                 it, 140, 200F
             )
+            Toast.makeText(
+                it.context,
+                "AddViewToCircularFlow - Radius: " + 140 + " Angle: " + 200,
+                Toast.LENGTH_SHORT
+            ).show()
         }
 
         findViewById<View>(R.id.view8).setOnClickListener {
             findViewById<CircularFlow>(R.id.circularFlow).addViewToCircularFlow(
                 it, 150, 240F
             )
+            Toast.makeText(
+                it.context,
+                "addViewToCircularFlow - Radius: " + 150 + " Angle: " + 240,
+                Toast.LENGTH_SHORT
+            ).show()
         }
 
         findViewById<View>(R.id.view2).setOnClickListener {
-            findViewById<CircularFlow>(R.id.circularFlow).removeView(
-                it
+            findViewById<CircularFlow>(R.id.circularFlow).updateAngle(
+                it, 90F
             )
+            Toast.makeText(it.context, "UpdateAngle Angle: " + 90, Toast.LENGTH_SHORT).show()
         }
 
         findViewById<View>(R.id.view3).setOnClickListener {
-            findViewById<CircularFlow>(R.id.circularFlow).removeView(
-                it
+            findViewById<CircularFlow>(R.id.circularFlow).updateRadius(
+                it, 150
             )
+            Toast.makeText(it.context, "UpdateRadius Radius: " + 150, Toast.LENGTH_SHORT).show()
+
         }
 
         findViewById<View>(R.id.view4).setOnClickListener {
+            findViewById<CircularFlow>(R.id.circularFlow).updateReference(
+                it, 160, 135F
+            )
+            Toast.makeText(
+                it.context,
+                "UpdateReference - Radius: " + 160 + " Angle: " + 135,
+                Toast.LENGTH_SHORT
+            ).show()
+        }
+
+        findViewById<View>(R.id.view5).setOnClickListener {
             findViewById<CircularFlow>(R.id.circularFlow).removeView(
                 it
             )