From 3e2e12d00285ec813ca200c45ee35b3924994172 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Sun, 24 Nov 2019 14:48:51 +0100
Subject: [PATCH] Adjust Android Analog Stick Dimensions

---
 .../java/com/metallic/chiaki/touchcontrols/AnalogStickView.kt | 3 ++-
 android/app/src/main/res/values/dimens.xml                    | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/android/app/src/main/java/com/metallic/chiaki/touchcontrols/AnalogStickView.kt b/android/app/src/main/java/com/metallic/chiaki/touchcontrols/AnalogStickView.kt
index 5767532..563463b 100644
--- a/android/app/src/main/java/com/metallic/chiaki/touchcontrols/AnalogStickView.kt
+++ b/android/app/src/main/java/com/metallic/chiaki/touchcontrols/AnalogStickView.kt
@@ -78,7 +78,8 @@ class AnalogStickView @JvmOverloads constructor(
 		val center = center
 		if(center != null)
 		{
-			drawableBase?.setBounds((center.x - radius).toInt(), (center.y - radius).toInt(), (center.x + radius).toInt(), (center.y + radius).toInt())
+			val circleRadius = radius + handleRadius
+			drawableBase?.setBounds((center.x - circleRadius).toInt(), (center.y - circleRadius).toInt(), (center.x + circleRadius).toInt(), (center.y + circleRadius).toInt())
 			drawableBase?.draw(canvas)
 
 			val handleX = center.x + handlePosition.x * radius
diff --git a/android/app/src/main/res/values/dimens.xml b/android/app/src/main/res/values/dimens.xml
index e71e7d2..543f0f4 100644
--- a/android/app/src/main/res/values/dimens.xml
+++ b/android/app/src/main/res/values/dimens.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="control_face_button_size">48dp</dimen>
-    <dimen name="control_analog_stick_radius">64dp</dimen>
-    <dimen name="control_analog_stick_handle_radius">16dp</dimen>
+    <dimen name="control_analog_stick_radius">48dp</dimen>
+    <dimen name="control_analog_stick_handle_radius">32dp</dimen>
     <dimen name="floating_action_button_speed_dial_anim_offset">48dp</dimen>
 </resources>
\ No newline at end of file