Merge branch 'tmp' into main

Author: guaishouN

.idea/misc.xml

@@ -45,6 +45,8 @@ public GysoTreeView(@NonNull Context context, @Nullable AttributeSet attrs, int
         treeViewContainer.setLayoutParams(layoutParams);
         addView(treeViewContainer);
         treeViewGestureHandler = new TouchEventHandler(getContext(), treeViewContainer);
+
+        //Note: do not set setKeepInViewport(true), there still has bug
         treeViewGestureHandler.setKeepInViewport(false);
 
         //set animate default

library/src/main/java/com/gyso/treeview/GysoTreeView.java

@@ -412,7 +412,7 @@ public void onViewReleased(@NonNull  View releasedChild, float xvel, float yvel)
                 mTreeModel.addNode(targetHolderNode,releasedChildHolderNode);
                 mTreeModel.calculateTreeNodesDeep();
                 if(isAnimateMove()){
-                    recordAnchorLocationOnViewPort(false,targetHolderNode);
+                    recordAnchorLocationOnViewPort(false,false,targetHolderNode);
                 }
                 requestLayout();
             }else{
@@ -561,7 +561,7 @@ public void onDataSetChange(){
     public void onAddNodes(NodeModel<?> parent, NodeModel<?>... childNodes) {
         if(adapter!=null){
             if(isAnimateAdd()){
-                recordAnchorLocationOnViewPort(false, parent);
+                recordAnchorLocationOnViewPort(false, false,parent);
             }
             mTreeModel.addNode(parent,childNodes);
             mTreeModel.calculateTreeNodesDeep();
@@ -572,52 +572,73 @@ public void onAddNodes(NodeModel<?> parent, NodeModel<?>... childNodes) {
     }
 
     @Override
-    public void onRemoveNodes(NodeModel<?>... nodeModels) {
+    public void onRemoveNode(NodeModel<?> nodeModel) {
+        innerRemoveNode(nodeModel, false);
+    }
+
+    @Override
+    public void onRemoveChildNodes(NodeModel<?> parentNode) {
+        innerRemoveNode(parentNode,true);
+    }
+
+    private void innerRemoveNode(NodeModel<?> nodeModel, boolean isRemoveChildNodesOnly){
         if(adapter!=null){
             if(isAnimateRemove()){
-                recordAnchorLocationOnViewPort(true, nodeModels);
-            }
-            for (NodeModel<?> nodeToRemove : nodeModels) {
-                adapter.getTreeModel().removeNode(nodeToRemove.getParentNode(), nodeToRemove);
-            }
-            mTreeModel.calculateTreeNodesDeep();
-            if(isAnimateRemove()){
-                requestLayout();
+                recordAnchorLocationOnViewPort(true,isRemoveChildNodesOnly ,nodeModel);
+                if(isRemoveChildNodesOnly){
+                    nodeModel.traverseDirectChildren(next->adapter.getTreeModel().removeNode(nodeModel, next));
+                }else{
+                    adapter.getTreeModel().removeNode(nodeModel.getParentNode(), nodeModel);
+                }
             }else{
-                for (NodeModel<?> nodeToRemove : nodeModels) {
-                    nodeToRemove.selfTraverse(next -> {
-                        //remove view
-                        TreeViewHolder<?> holder = getTreeViewHolder(next);
-                        if(holder != null){
-                            removeView(holder.getView());
-                            recycleHolder(holder);
-                        }
-                    });
+                if(isRemoveChildNodesOnly){
+                    nodeModel.traverseExcludeSelf(this::removeViewByNode);
+                    nodeModel.traverseDirectChildren(next->adapter.getTreeModel().removeNode(nodeModel, next));
+                }else{
+                    nodeModel.traverseIncludeSelf(this::removeViewByNode);
+                    adapter.getTreeModel().removeNode(nodeModel.getParentNode(), nodeModel);
                 }
             }
+            mTreeModel.calculateTreeNodesDeep();
+            requestLayout();
+        }
+    }
+
+    /**
+     * Remove View By Node
+     * @param nodeModel node to remove the view
+     */
+    private void removeViewByNode(NodeModel<?> nodeModel){
+        //remove view
+        TreeViewHolder<?> holder = getTreeViewHolder(nodeModel);
+        if(holder != null){
+            removeView(holder.getView());
+            recycleHolder(holder);
         }
     }
 
     /**
      * Prepare moving, adding or removing nodes, record the last one node as an anchor node on view port, so that make it looks smooth change
-     * Note:
-     *     The last one will been choose as target node.
-     *
-     *  @param nodeModels nodes[nodes.length-1] as the target one
+     *  @param targetNode  the target one
      */
-    private void recordAnchorLocationOnViewPort(boolean isRemove, NodeModel<?>... nodeModels) {
-        if(nodeModels==null || nodeModels.length==0){
+    private void recordAnchorLocationOnViewPort(boolean isRemove, boolean isRemoveChildrenOnly, NodeModel<?> targetNode) {
+        if(targetNode==null){
             return;
         }
-        NodeModel<?> targetNode = nodeModels[nodeModels.length-1];
-        if(targetNode!=null && isRemove){
+        if(isRemove){
             //if remove, parent will be the target node
             Map<NodeModel<?>,View> removeNodeMap = new HashMap<>();
-            targetNode.selfTraverse(node -> {
-                removeNodeMap.put(node,getTreeViewHolder(node).getView());
-            });
+            if(isRemoveChildrenOnly){
+                targetNode.traverseExcludeSelf(node -> {
+                    removeNodeMap.put(node,getTreeViewHolder(node).getView());
+                });
+            }else{
+                targetNode.traverseIncludeSelf(node -> {
+                    removeNodeMap.put(node,getTreeViewHolder(node).getView());
+                });
+                targetNode = targetNode.getParentNode();
+            }
             setTag(R.id.mark_remove_views,removeNodeMap);
-            targetNode = targetNode.getParentNode();
         }
         if(targetNode!=null){
             TreeViewHolder<?> targetHolder = getTreeViewHolder(targetNode);

library/src/main/java/com/gyso/treeview/TreeViewContainer.java

@@ -68,7 +68,18 @@ public void addChildNodes(NodeModel<?> parent, NodeModel<?>... childNodes) {
     public void removeNode(NodeModel<?> nodeToRemove){
         TreeViewContainer container = getContainer();
         if(container!=null){
-            container.onRemoveNodes(nodeToRemove);
+            container.onRemoveNode(nodeToRemove);
+        }
+    }
+
+    /**
+     * remove children nodes by parent node
+     * @param parentNode parent node to remove children
+     */
+    public void removeNodeChildren(NodeModel<?> parentNode){
+        TreeViewContainer container = getContainer();
+        if(container!=null){
+            container.onRemoveChildNodes(parentNode);
         }
     }
 }

library/src/main/java/com/gyso/treeview/TreeViewEditor.java

@@ -12,7 +12,8 @@
  */
 public interface TreeViewNotifier{
     void onDataSetChange();
-    void onRemoveNodes(NodeModel<?>... nodeModel);
+    void onRemoveNode(NodeModel<?>nodeModel);
+    void onRemoveChildNodes(NodeModel<?> parentNode);
     void onItemViewChange(NodeModel<?> nodeModel);
     void onAddNodes(NodeModel<?> parent, NodeModel<?>... childNodes);
 }

library/src/main/java/com/gyso/treeview/listener/TreeViewNotifier.java

@@ -4,6 +4,7 @@
 import androidx.annotation.Nullable;
 
 import java.io.Serializable;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Stack;
@@ -128,29 +129,60 @@ private boolean addChildNode(NodeModel<T> aChild){
      * traverse
      * @param node to deal node
      */
-    public void traverse(NodeModel<T> node, INext<T> next){
+    private void traverse(NodeModel<T> node, INext<T> next){
+        traverse(node,next,true);
+    }
+
+    private void traverse(NodeModel<T> node, INext<T> next, boolean isIncludeSelf){
         if(node==null || next==null){
             return;
         }
         Stack<NodeModel<T>> stack = new Stack<>();
         stack.add(node);
         while (!stack.isEmpty()) {
             NodeModel<T> tmp = stack.pop();
-            next.next(tmp);
+            if(isIncludeSelf){
+                next.next(tmp);
+            }else if(tmp!=this){
+                next.next(tmp);
+            }
             LinkedList<NodeModel<T>> childNodes = tmp.getChildNodes();
             stack.addAll(childNodes);
         }
     }
+    /**
+     * traverse all sub node include self
+     * @param next callback
+     */
+    public void traverseIncludeSelf(INext<T> next){
+        if(next==null){
+            return;
+        }
+        traverse(this,next,true);
+    }
 
     /**
-     * traverse bys self
+     * traverse all sub node exclude self
      * @param next callback
      */
-    public void selfTraverse(INext<T> next){
+    public void traverseExcludeSelf(INext<T> next){
         if(next==null){
             return;
         }
-        traverse(this,next);
+        traverse(this,next,false);
+    }
+
+    /**
+     * traverse only direct children
+     * @param next callback
+     */
+    public void traverseDirectChildren(INext<T> next){
+        if(next==null){
+            return;
+        }
+        for (NodeModel<T> childNode : new LinkedList<>(childNodes)) {
+            next.next(childNode);
+        }
     }
 
     public void removeChildNode(NodeModel<T> aChild){

library/src/main/java/com/gyso/treeview/model/NodeModel.java

@@ -33,6 +33,7 @@ public class MainActivity extends AppCompatActivity {
     private NodeModel<Animal> targetNode;
     private AtomicInteger atomicInteger = new AtomicInteger();
     private Handler handler = new Handler();
+    private NodeModel<Animal> parentToRemoveChildren = null;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -116,6 +117,11 @@ void doYourOwnJobs(TreeViewEditor editor, AnimalTreeViewAdapter adapter){
             editor.removeNode(toRemoveNode);
         });
 
+        //remove node
+        binding.removeChildrenBt.setOnClickListener(v->{
+            editor.removeNodeChildren(parentToRemoveChildren);
+        });
+
         adapter.setOnItemListener((item, node)-> {
             Animal animal = node.getValue();
             Toast.makeText(this,"you click the head of "+animal,Toast.LENGTH_SHORT).show();
@@ -203,6 +209,7 @@ private void setData(AnimalTreeViewAdapter adapter){
         treeModel.addNode(sub1,sub2);
         treeModel.addNode(sub0,sub4,sub5);
         treeModel.addNode(sub4,sub6);
+        parentToRemoveChildren = sub0;
 //        treeModel.addNode(sub5,sub7,sub8);
 //        treeModel.addNode(sub6,sub9,sub10,sub11);
 //        treeModel.addNode(sub3,sub12,sub13);

sample/src/main/java/com/gyso/gysotreeviewapplication/MainActivity.java

@@ -67,6 +67,20 @@
                 android:foreground="?attr/selectableItemBackground"
                 app:layout_constraintLeft_toRightOf="@+id/add_nodes_bt"
                 app:layout_constraintTop_toTopOf="parent" />
+            <TextView
+                android:id="@+id/remove_children_bt"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="5dp"
+                android:padding="6dp"
+                android:checked="false"
+                android:text="REMOVE C"
+                android:textStyle="bold"
+                android:textColor="@android:color/white"
+                android:background="@drawable/drag_mode_bg"
+                android:foreground="?attr/selectableItemBackground"
+                app:layout_constraintLeft_toRightOf="@+id/add_nodes_bt"
+                app:layout_constraintTop_toTopOf="parent" />
         </LinearLayout>
         <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/drag_edit_mode_rd"