From 46a2bddbcd5760ba55f88d7a2123d774c3e079f7 Mon Sep 17 00:00:00 2001
From: khanhduytran0 <khanhduytran032@gmail.com>
Date: Sat, 6 Feb 2021 11:16:37 +0700
Subject: [PATCH] [Custom controls] Add settings to change size manually

---
 .../handleview/ActionPopupWindow.java         |  7 +++
 .../src/main/res/layout/control_setting.xml   | 45 ++++++++++++++++---
 .../src/main/res/values/strings.xml           |  3 ++
 3 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/ActionPopupWindow.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/ActionPopupWindow.java
index 96e2aa2bb..4fa393dce 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/ActionPopupWindow.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/ActionPopupWindow.java
@@ -116,6 +116,11 @@ public class ActionPopupWindow extends PinnedPopupWindow implements OnClickListe
                         final CheckBox checkToggle = dialog.findViewById(R.id.controlsetting_checkbox_toggle);
                         checkToggle.setChecked(properties.isToggle);
 
+                        final EditText editWidth = dialog.findViewById(R.id.controlsetting_edit_width);
+                        final EditText editHeight = dialog.findViewById(R.id.controlsetting_edit_height);
+                        editWidth.setText(Float.toString(properties.width));
+                        editHeight.setText(Float.toString(properties.height));
+                        
                         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);
@@ -201,6 +206,8 @@ public class ActionPopupWindow extends PinnedPopupWindow implements OnClickListe
 										properties.hidden = false;
                                         properties.isToggle = checkToggle.isChecked();
                                         properties.isDynamicBtn = checkDynamicPos.isChecked();
+                                        properties.width = Float.parseFloat(editWidth.toString());
+                                        properties.height = Float.parseFloat(editHeight.toString());
                                         properties.dynamicX = editDynamicX.getText().toString();    
                                         properties.dynamicY = editDynamicY.getText().toString();
 
diff --git a/app_pojavlauncher/src/main/res/layout/control_setting.xml b/app_pojavlauncher/src/main/res/layout/control_setting.xml
index a130e3ae1..6659a7374 100644
--- a/app_pojavlauncher/src/main/res/layout/control_setting.xml
+++ b/app_pojavlauncher/src/main/res/layout/control_setting.xml
@@ -30,11 +30,11 @@
 			android:singleLine="true"
 			android:id="@+id/controlsetting_edit_name"/>
 
-        <TextView
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:text="@string/customctrl_transparency_bg"/>
-        
+		<TextView
+			android:layout_height="wrap_content"
+			android:layout_width="wrap_content"
+			android:text="@string/customctrl_transparency_bg"/>
+
 		<SeekBar
 			android:layout_height="wrap_content"
 			android:layout_width="match_parent"
@@ -46,6 +46,41 @@
 			android:text="@string/customctrl_toggle"
 			android:id="@+id/controlsetting_checkbox_toggle"/>
 
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/customctrl_size"/>
+
+		<LinearLayout
+			android:orientation="horizontal"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:gravity="center">
+
+			<EditText
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_weight="1.0"
+				android:id="@+id/controlsetting_edit_width"
+				android:hint="@string/customctrl_size_width"
+				android:inputType="numberDecimal"/>
+
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="×"
+				android:gravity="center"/>
+
+			<EditText
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_weight="1.0"
+				android:id="@+id/controlsetting_edit_height"
+				android:hint="@string/customctrl_size_height"
+				android:inputType="numberDecimal"/>
+
+		</LinearLayout>
+
 		<CheckBox
 			android:layout_height="wrap_content"
 			android:layout_width="match_parent"
diff --git a/app_pojavlauncher/src/main/res/values/strings.xml b/app_pojavlauncher/src/main/res/values/strings.xml
index af4a82cf8..7e89b4240 100644
--- a/app_pojavlauncher/src/main/res/values/strings.xml
+++ b/app_pojavlauncher/src/main/res/values/strings.xml
@@ -177,6 +177,9 @@
     
     <string name="customctrl_keyname">Keycode</string>
     <string name="customctrl_toggle">Toggleable</string>
+    <string name="customctrl_size">Size</string>
+    <string name="customctrl_size_width">Width</string>
+    <string name="customctrl_size_height">Height</string>
     
     <string name="customctrl_dynamicpos">Dynamic position</string>
     <string name="customctrl_dynamicpos_x">Dynamic X</string>