From b5a96dc4dcee3a736390d868a3b0be52a019d56d Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sun, 9 Jun 2024 14:25:19 +0200
Subject: [PATCH] Option to tweak or disable the circle gesture

---
 res/values-cs/strings.xml         |  5 +++++
 res/values-de/strings.xml         |  5 +++++
 res/values-es/strings.xml         |  5 +++++
 res/values-fa/strings.xml         |  5 +++++
 res/values-fr/strings.xml         |  5 +++++
 res/values-it/strings.xml         |  5 +++++
 res/values-ko/strings.xml         |  5 +++++
 res/values-lv/strings.xml         |  5 +++++
 res/values-pl/strings.xml         |  5 +++++
 res/values-pt/strings.xml         |  5 +++++
 res/values-ro/strings.xml         |  5 +++++
 res/values-ru/strings.xml         |  5 +++++
 res/values-tr/strings.xml         |  5 +++++
 res/values-uk/strings.xml         |  5 +++++
 res/values-vi/strings.xml         |  5 +++++
 res/values-zh-rCN/strings.xml     |  5 +++++
 res/values/arrays.xml             | 12 ++++++++++++
 res/values/strings.xml            |  5 +++++
 res/xml/settings.xml              |  1 +
 srcs/juloo.keyboard2/Config.java  |  2 ++
 srcs/juloo.keyboard2/Gesture.java |  2 +-
 21 files changed, 101 insertions(+), 1 deletion(-)

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 088b774..8474f7f 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -77,6 +77,11 @@ Tato aplikace neobsahuje žádné reklamy, nevyužívá připojení k síti a je
   <string name="pref_border_config_title">Přizpůsobit okraje</string>
   <string name="pref_border_width_title">Šířka okraje</string>
   <string name="pref_corners_radius_title">Poloměr okraje</string>
+  <!-- <string name="pref_circle_sensitivity_title">Circle gesture sensitivity</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_high">High</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_medium">Medium</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_low">Low</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_disabled">Disabled</string> -->
   <string name="key_action_next">Další</string>
   <string name="key_action_done">Dokončit</string>
   <string name="key_action_go">Spustit</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index df2c106..4dd9e82 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -77,6 +77,11 @@ Diese App enthält keine Werbung, benötigt keinen Netzwerkzugriff und ist quell
   <string name="pref_border_config_title">Ränder anpassen</string>
   <string name="pref_border_width_title">Randbreite</string>
   <string name="pref_corners_radius_title">Radius der Ecken</string>
+  <!-- <string name="pref_circle_sensitivity_title">Circle gesture sensitivity</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_high">High</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_medium">Medium</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_low">Low</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_disabled">Disabled</string> -->
   <string name="key_action_next">Nächstes</string>
   <string name="key_action_done">Fertig</string>
   <string name="key_action_go">Los</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b24f8fc..66ca26a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -77,6 +77,11 @@ La misma no contiene ningún anuncio/publicidad, no realiza peticiones de red y
   <string name="pref_border_config_title">Bordes personalizados</string>
   <string name="pref_border_width_title">Ancho de bordes</string>
   <string name="pref_corners_radius_title">Radio de rincones</string>
+  <!-- <string name="pref_circle_sensitivity_title">Circle gesture sensitivity</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_high">High</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_medium">Medium</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_low">Low</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_disabled">Disabled</string> -->
   <string name="key_action_next">Siguiente</string>
   <string name="key_action_done">Hecho</string>
   <string name="key_action_go">Ir</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 76e8db1..f8132ce 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -77,6 +77,11 @@ This application contains no ads, doesn't make any network requests and is Open
   <!-- <string name="pref_border_config_title">Customize borders</string> -->
   <!-- <string name="pref_border_width_title">Border Width</string> -->
   <!-- <string name="pref_corners_radius_title">Corner radius</string> -->
+  <!-- <string name="pref_circle_sensitivity_title">Circle gesture sensitivity</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_high">High</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_medium">Medium</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_low">Low</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_disabled">Disabled</string> -->
   <string name="key_action_next">بعدی</string>
   <string name="key_action_done">اتمام</string>
   <string name="key_action_go">برو</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 4450819..5530a8b 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -77,6 +77,11 @@ Cette application ne contient pas de publicité, n'accède pas au réseau et est
   <!-- <string name="pref_border_config_title">Customize borders</string> -->
   <!-- <string name="pref_border_width_title">Border Width</string> -->
   <!-- <string name="pref_corners_radius_title">Corner radius</string> -->
+  <!-- <string name="pref_circle_sensitivity_title">Circle gesture sensitivity</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_high">High</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_medium">Medium</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_low">Low</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_disabled">Disabled</string> -->
   <string name="key_action_next">Suiv.</string>
   <string name="key_action_done">Fin</string>
   <string name="key_action_go">Aller</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 12d6d34..84c5706 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -77,6 +77,11 @@ This application contains no ads, doesn't make any network requests and is Open
   <!-- <string name="pref_border_config_title">Customize borders</string> -->
   <!-- <string name="pref_border_width_title">Border Width</string> -->
   <!-- <string name="pref_corners_radius_title">Corner radius</string> -->
+  <!-- <string name="pref_circle_sensitivity_title">Circle gesture sensitivity</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_high">High</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_medium">Medium</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_low">Low</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_disabled">Disabled</string> -->
   <string name="key_action_next">Prossimo</string>
   <string name="key_action_done">Fatto</string>
   <string name="key_action_go">Vai</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 9e124b8..f0c1996 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -77,6 +77,11 @@ This application contains no ads, doesn't make any network requests and is Open
   <!-- <string name="pref_border_config_title">Customize borders</string> -->
   <!-- <string name="pref_border_width_title">Border Width</string> -->
   <!-- <string name="pref_corners_radius_title">Corner radius</string> -->
+  <!-- <string name="pref_circle_sensitivity_title">Circle gesture sensitivity</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_high">High</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_medium">Medium</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_low">Low</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_disabled">Disabled</string> -->
   <string name="key_action_next">다음</string>
   <string name="key_action_done">확인</string>
   <string name="key_action_go">Go</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 6152d46..c4c39b3 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -77,6 +77,11 @@ Tagad lieliski piemērota izmantošanai ikdienā.
   <string name="pref_border_config_title">Pielāgot apmales</string>
   <string name="pref_border_width_title">Apmales platums</string>
   <string name="pref_corners_radius_title">Stūru rādiuss</string>
+  <!-- <string name="pref_circle_sensitivity_title">Circle gesture sensitivity</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_high">High</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_medium">Medium</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_low">Low</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_disabled">Disabled</string> -->
   <string name="key_action_next">Nākamais</string>
   <string name="key_action_done">Darīts</string>
   <string name="key_action_go">Aiziet</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 5a4b8e9..fdd4635 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -77,6 +77,11 @@ Aplikacja nie zawiera reklam, nie żąda dostępu do internetu, a jej kod źród
   <string name="pref_border_config_title">Dostosuj krawędzie</string>
   <string name="pref_border_width_title">Grubość krawedzi</string>
   <string name="pref_corners_radius_title">Promień rogów</string>
+  <!-- <string name="pref_circle_sensitivity_title">Circle gesture sensitivity</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_high">High</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_medium">Medium</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_low">Low</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_disabled">Disabled</string> -->
   <string name="key_action_next">Dalej</string>
   <string name="key_action_done">OK</string>
   <string name="key_action_go">Przejdź</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index cd86df0..4eac2a7 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -77,6 +77,11 @@ Este aplicativo não contém anúncios, não faz nenhuma solicitação de rede e
   <string name="pref_border_config_title">Personalizar bordas</string>
   <string name="pref_border_width_title">Largura de borda</string>
   <string name="pref_corners_radius_title">Arredondamento de canto</string>
+  <!-- <string name="pref_circle_sensitivity_title">Circle gesture sensitivity</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_high">High</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_medium">Medium</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_low">Low</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_disabled">Disabled</string> -->
   <string name="key_action_next">Próximo</string>
   <string name="key_action_done">Pronto</string>
   <string name="key_action_go">Ir</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 5e4d358..cf54f43 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -77,6 +77,11 @@ Această aplicație nu conține publicitate, nu folosește rețeaua deloc și e
   <!-- <string name="pref_border_config_title">Customize borders</string> -->
   <!-- <string name="pref_border_width_title">Border Width</string> -->
   <!-- <string name="pref_corners_radius_title">Corner radius</string> -->
+  <!-- <string name="pref_circle_sensitivity_title">Circle gesture sensitivity</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_high">High</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_medium">Medium</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_low">Low</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_disabled">Disabled</string> -->
   <string name="key_action_next">Următor</string>
   <string name="key_action_done">Gata</string>
   <string name="key_action_go">Go</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 1b5c3db..59a048e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -77,6 +77,11 @@
   <string name="pref_border_config_title">Настройка рамки</string>
   <string name="pref_border_width_title">Ширина рамки</string>
   <string name="pref_corners_radius_title">Радиус скругления</string>
+  <!-- <string name="pref_circle_sensitivity_title">Circle gesture sensitivity</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_high">High</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_medium">Medium</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_low">Low</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_disabled">Disabled</string> -->
   <string name="key_action_next">Вперед</string>
   <string name="key_action_done">Ввод</string>
   <string name="key_action_go">Перейти</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index da03673..9f017ca 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -77,6 +77,11 @@ Bu uygulama açık kaynaklıdır. Reklam içermez ve internete bağlanmaz."</str
   <!-- <string name="pref_border_config_title">Customize borders</string> -->
   <!-- <string name="pref_border_width_title">Border Width</string> -->
   <!-- <string name="pref_corners_radius_title">Corner radius</string> -->
+  <!-- <string name="pref_circle_sensitivity_title">Circle gesture sensitivity</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_high">High</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_medium">Medium</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_low">Low</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_disabled">Disabled</string> -->
   <string name="key_action_next">Sonraki</string>
   <string name="key_action_done">Tamam</string>
   <string name="key_action_go">ileri</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 1ef0cf1..076d7e2 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -77,6 +77,11 @@
   <string name="pref_border_config_title">Налаштувати межі</string>
   <string name="pref_border_width_title">Ширина межі</string>
   <string name="pref_corners_radius_title">Радіус кута</string>
+  <!-- <string name="pref_circle_sensitivity_title">Circle gesture sensitivity</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_high">High</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_medium">Medium</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_low">Low</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_disabled">Disabled</string> -->
   <string name="key_action_next">Далі</string>
   <string name="key_action_done">Готово</string>
   <string name="key_action_go">Іти</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index d008bd1..a8bea74 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -77,6 +77,11 @@ Bây giờ đã hoàn hảo cho việc sử dụng hàng ngày.
   <!-- <string name="pref_border_config_title">Customize borders</string> -->
   <!-- <string name="pref_border_width_title">Border Width</string> -->
   <!-- <string name="pref_corners_radius_title">Corner radius</string> -->
+  <!-- <string name="pref_circle_sensitivity_title">Circle gesture sensitivity</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_high">High</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_medium">Medium</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_low">Low</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_disabled">Disabled</string> -->
   <string name="key_action_next">Tiếp</string>
   <string name="key_action_done">Xong</string>
   <string name="key_action_go">Đi</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 2ceff86..20eba97 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -77,6 +77,11 @@
   <string name="pref_border_config_title">自定义边界</string>
   <string name="pref_border_width_title">边界宽度</string>
   <string name="pref_corners_radius_title">圆角半径</string>
+  <!-- <string name="pref_circle_sensitivity_title">Circle gesture sensitivity</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_high">High</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_medium">Medium</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_low">Low</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_disabled">Disabled</string> -->
   <string name="key_action_next">下一项</string>
   <string name="key_action_done">完成</string>
   <string name="key_action_go">前往</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 04d13f9..9176882 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -54,4 +54,16 @@
     <item>25</item>
     <item>35</item>
   </string-array>
+  <string-array name="pref_circle_sensitivity_entries">
+    <item>@string/pref_circle_sensitivity_e_high</item>
+    <item>@string/pref_circle_sensitivity_e_medium</item>
+    <item>@string/pref_circle_sensitivity_e_low</item>
+    <item>@string/pref_circle_sensitivity_e_disabled</item>
+  </string-array>
+  <string-array name="pref_circle_sensitivity_values">
+    <item>2</item>
+    <item>3</item>
+    <item>4</item>
+    <item>12</item>
+  </string-array>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 542feee..9050ce8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -77,6 +77,11 @@ This application contains no ads, doesn't make any network requests and is Open
   <string name="pref_border_config_title">Customize borders</string>
   <string name="pref_border_width_title">Border Width</string>
   <string name="pref_corners_radius_title">Corner radius</string>
+  <string name="pref_circle_sensitivity_title">Circle gesture sensitivity</string>
+  <string name="pref_circle_sensitivity_e_high">High</string>
+  <string name="pref_circle_sensitivity_e_medium">Medium</string>
+  <string name="pref_circle_sensitivity_e_low">Low</string>
+  <string name="pref_circle_sensitivity_e_disabled">Disabled</string>
   <string name="key_action_next">Next</string>
   <string name="key_action_done">Done</string>
   <string name="key_action_go">Go</string>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 3068f78..270dfcd 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -14,6 +14,7 @@
   </PreferenceCategory>
   <PreferenceCategory android:title="@string/pref_category_typing">
     <ListPreference android:key="swipe_dist" android:title="@string/pref_swipe_dist_title" android:summary="@string/pref_swipe_dist_summary" android:defaultValue="15" android:entries="@array/pref_swipe_dist_entries" android:entryValues="@array/pref_swipe_dist_values"/>
+    <ListPreference android:key="circle_sensitivity" android:title="@string/pref_circle_sensitivity_title" android:summary="%s" android:defaultValue="2" android:entries="@array/pref_circle_sensitivity_entries" android:entryValues="@array/pref_circle_sensitivity_values"/>
     <juloo.keyboard2.prefs.IntSlideBarPreference android:key="longpress_timeout" android:title="@string/pref_long_timeout_title" android:summary="%sms" android:defaultValue="600" min="50" max="2000"/>
     <juloo.keyboard2.prefs.IntSlideBarPreference android:key="longpress_interval" android:title="@string/pref_long_interval_title" android:summary="%sms" android:defaultValue="25" min="5" max="100"/>
     <CheckBoxPreference android:key="lock_double_tap" android:title="@string/pref_lock_double_tap_title" android:summary="@string/pref_lock_double_tap_summary" android:defaultValue="false"/>
diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index 09b3157..8b72bc7 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -65,6 +65,7 @@ public final class Config
   public boolean switch_input_immediate;
   public boolean pin_entry_enabled;
   public boolean borderConfig;
+  public int circle_sensitivity;
 
   // Dynamically set
   public boolean shouldOfferVoiceTyping;
@@ -181,6 +182,7 @@ public final class Config
     pin_entry_enabled = _prefs.getBoolean("pin_entry_enabled", true);
     current_layout_portrait = _prefs.getInt("current_layout_portrait", 0);
     current_layout_landscape = _prefs.getInt("current_layout_landscape", 0);
+    circle_sensitivity = Integer.valueOf(_prefs.getString("circle_sensitivity", "2"));
   }
 
   public int get_current_layout()
diff --git a/srcs/juloo.keyboard2/Gesture.java b/srcs/juloo.keyboard2/Gesture.java
index 5ee666b..d54b51a 100644
--- a/srcs/juloo.keyboard2/Gesture.java
+++ b/srcs/juloo.keyboard2/Gesture.java
@@ -86,7 +86,7 @@ public final class Gesture
     switch (state)
     {
       case Swiped:
-        if (Math.abs(d) < ROTATION_THRESHOLD)
+        if (Math.abs(d) < Config.globalConfig().circle_sensitivity)
           return false;
         // Start a rotation
         state = (clockwise) ?