From c19d5791d4f6299061bf8166d6adca5267e1025a Mon Sep 17 00:00:00 2001
From: khanhduytran0 <khanhduytran032@gmail.com>
Date: Sat, 5 Dec 2020 06:11:42 +0700
Subject: [PATCH] [Custom control] Bug fix: dynamic position is editable on
 non-dynamic state

---
 .../java/com/kdt/handleview/ActionPopupWindow.java   | 12 +++++++-----
 app/src/main/res/layout/control_setting.xml          |  3 +--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/kdt/handleview/ActionPopupWindow.java b/app/src/main/java/com/kdt/handleview/ActionPopupWindow.java
index f449a4249..37f8e852e 100644
--- a/app/src/main/java/com/kdt/handleview/ActionPopupWindow.java
+++ b/app/src/main/java/com/kdt/handleview/ActionPopupWindow.java
@@ -122,20 +122,22 @@ public class ActionPopupWindow extends PinnedPopupWindow implements OnClickListe
                         final CheckBox checkToggle = dialog.findViewById(R.id.controlsetting_checkbox_toggle);
                         checkToggle.setChecked(properties.isToggle);
 
-                        final LinearLayout layoutDynamicBtn = dialog.findViewById(R.id.controlsetting_dynamicbtnlayout);
+                        final EditText editDynamicX = dialog.findViewById(R.id.controlsetting_edit_dynamicpos_x);
+                        final EditText editDynamicY = dialog.findViewById(R.id.controlsetting_edit_dynamicpos_y);
+                        editDynamicX.setEnabled(properties.isDynamicBtn);
+                        editDynamicY.setEnabled(properties.isDynamicBtn);
+                        
                         final CheckBox checkDynamicPos = dialog.findViewById(R.id.controlsetting_checkbox_dynamicpos);
                         checkDynamicPos.setOnCheckedChangeListener(new CheckBox.OnCheckedChangeListener(){
 
                                 @Override
                                 public void onCheckedChanged(CompoundButton btn, boolean checked) {
-                                    layoutDynamicBtn.setVisibility(checked ? View.VISIBLE : View.GONE);
+                                    editDynamicX.setEnabled(checked);
+                                    editDynamicY.setEnabled(checked);
                                 }
                             });
                         checkDynamicPos.setChecked(properties.isDynamicBtn);
                         
-                        final EditText editDynamicX = dialog.findViewById(R.id.controlsetting_edit_dynamicpos_x);
-                        final EditText editDynamicY = dialog.findViewById(R.id.controlsetting_edit_dynamicpos_y);
-                        
                         editDynamicX.setHint(Float.toString(properties.x));
                         editDynamicX.setText(properties.dynamicX);
                         
diff --git a/app/src/main/res/layout/control_setting.xml b/app/src/main/res/layout/control_setting.xml
index 70b94a37d..1bf4110dd 100644
--- a/app/src/main/res/layout/control_setting.xml
+++ b/app/src/main/res/layout/control_setting.xml
@@ -51,8 +51,7 @@
 		<LinearLayout
 			android:layout_height="wrap_content"
 			android:layout_width="match_parent"
-			android:orientation="vertical"
-			android:id="@+id/controlsetting_dynamicbtnlayout">
+			android:orientation="vertical">
 
 			<TextView
 				android:layout_height="wrap_content"