wip: implement some working mechanism for ActionBlockLayerView

Innovative-CST · Jan 7, 2025 · 1cdb707 · 1cdb707
1 parent 7a46e4c
commit 1cdb707
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 1 deletion.
diff --git a/logiceditor/src/main/java/com/icst/logic/editor/view/LogicEditorView.java b/logiceditor/src/main/java/com/icst/logic/editor/view/LogicEditorView.java
@@ -46,6 +46,7 @@
 import com.icst.logic.editor.event.LogicEditorEventListener;
 import com.icst.logic.lib.config.LogicEditorConfiguration;
 import com.icst.logic.lib.view.ActionBlockDropZoneView;
+import com.icst.logic.lib.view.ActionBlockLayerView;
 import com.icst.logic.lib.view.BlockDropZoneView;
 import com.icst.logic.lib.view.DraggingBlockDummy;
 import com.icst.logic.lib.view.MainActionBlockDropZoneView;
@@ -334,6 +335,13 @@ public void resetFromDragging() {
 				for (int i = index; i < regularChain.getChildCount(); ++i) {
 					regularChain.getChildAt(i).setVisibility(View.VISIBLE);
 				}
+			} else if (actionBlockBeanView.getParent().getParent() != null) {
+				if (actionBlockBeanView.getParent().getParent() instanceof ActionBlockLayerView regularChain) {
+					index = regularChain.getBlockLayout().indexOfChild(actionBlockBeanView);
+					for (int i = index; i < regularChain.getBlocksSize(); ++i) {
+						regularChain.getBlockLayout().getChildAt(i).setVisibility(View.VISIBLE);
+					}
+				}
 			}
 		}
 	}

diff --git a/logiceditor/src/main/java/com/icst/logic/lib/view/ActionBlockLayerView.java b/logiceditor/src/main/java/com/icst/logic/lib/view/ActionBlockLayerView.java
@@ -99,7 +99,7 @@ public int getIndex(float x, float y) {
 	// Configured for ActionBlockLayerView
 	@Override
 	protected void addBlockBeans(ArrayList<ActionBlockBean> actionBlocks, int index) {
-		this.getBlockBeans().addAll(index, actionBlocks);
+		getBlockBeans().addAll(index, actionBlocks);
 
 		for (int i = 0; i < actionBlocks.size(); ++i) {
 			ActionBlockBean actionBlock = actionBlocks.get(i);
@@ -204,4 +204,8 @@ public void setLayerPosition(int layerPosition) {
 	public ActionBlockLayerView getView() {
 		return this;
 	}
+
+	public LinearLayout getBlockLayout() {
+		return this.blockLayout;
+	}
 }
diff --git a/logiceditor/src/main/java/com/icst/logic/listener/DraggableTouchListener.java b/logiceditor/src/main/java/com/icst/logic/listener/DraggableTouchListener.java
@@ -38,6 +38,7 @@
 import com.icst.logic.block.view.RegularBlockBeanView;
 import com.icst.logic.editor.view.LogicEditorView;
 import com.icst.logic.lib.view.ActionBlockDropZoneView;
+import com.icst.logic.lib.view.ActionBlockLayerView;
 import com.icst.logic.lib.view.DraggingBlockDummy;
 import com.icst.logic.lib.view.MainActionBlockDropZoneView;
 import com.icst.logic.utils.CanvaMathUtils;
@@ -97,6 +98,18 @@ public void run() {
 											.setVisibility(View.GONE);
 									draggingBlocks.add(blocksList.get(i));
 								}
+							} else if (actionBlockDropZone.getParent() != null) {
+								if (actionBlockDropZone.getParent() instanceof ActionBlockLayerView regularChain) {
+									int index = regularChain
+											.getBlockLayout()
+											.indexOfChild(actionBlockBeanView);
+									blocksList = regularChain.getBlockBeans();
+
+									for (int i = index; i < regularChain.getBlocksSize(); ++i) {
+										regularChain.getBlockLayout().getChildAt(i).setVisibility(View.GONE);
+										draggingBlocks.add(blocksList.get(i));
+									}
+								}
 							}
 
 							draggingBean = draggingBlocks;

diff --git a/logiceditor/src/main/res/drawable-xhdpi/action_block_layer_top.9.png b/logiceditor/src/main/res/drawable-xhdpi/action_block_layer_top.9.png