From 7a3312fd01ef2bf48b146677766f7ea4b036b7df Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Sun, 9 May 2021 00:09:10 +0200
Subject: Add the accents preference

This replaces the "disable accent keys" checkbox.
The default should work for anyone: Accents will be hidden unless the
user has the french language installed.

The value "show every accents" is useful for versions of android that
don't have subtypes.
---
 res/values/arrays.xml  | 15 +++++++++++++++
 res/values/strings.xml |  9 +++++++--
 res/xml/method.xml     |  2 +-
 res/xml/settings.xml   | 13 +++++++------
 4 files changed, 30 insertions(+), 9 deletions(-)

(limited to 'res')

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index c6e2139..7e8a9bf 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -5,4 +5,19 @@
     <item>azerty</item>
     <item>qwerty</item>
   </string-array>
+
+  <string name="pref_accents_default">1</string>
+
+  <string-array name="pref_accents_entries">
+    <item>@string/pref_accents_e_all_installed</item>
+    <item>@string/pref_accents_e_selected</item>
+    <item>@string/pref_accents_e_all</item>
+    <item>@string/pref_accents_e_none</item>
+  </string-array>
+  <string-array name="pref_accents_values">
+    <item>1</item>
+    <item>2</item>
+    <item>3</item>
+    <item>4</item>
+  </string-array>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 04c3b57..a15fc5b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -16,8 +16,13 @@
     <item>Azerty</item>
     <item>Qwerty</item>
   </string-array>
-	<string name="pref_disable_accent_keys_title">Toggle accent keys</string>
-	<string name="pref_disable_accent_keys_summary">Whether to remove the accent keys from the keyboard</string>
+
+  <string name="pref_accents_title">Accents</string>
+  <string name="pref_accents_summary">%s</string>
+  <string name="pref_accents_e_all_installed">Show accents for all the installed languages</string>
+  <string name="pref_accents_e_selected">Show accents for the selected language</string>
+  <string name="pref_accents_e_all">Show every accents</string>
+  <string name="pref_accents_e_none">Hide accents</string>
 
 	<string name="pref_category_typing">Typing</string>
 	<string name="pref_preci_title">Precision</string>
diff --git a/res/xml/method.xml b/res/xml/method.xml
index 5a515cd..a84df7c 100644
--- a/res/xml/method.xml
+++ b/res/xml/method.xml
@@ -14,6 +14,6 @@
       android:imeSubtypeLocale="fr_FR"
       android:imeSubtypeMode="keyboard"
       android:isAsciiCapable="true"
-      android:imeSubtypeExtraValue="default_layout=azerty"
+      android:imeSubtypeExtraValue="default_layout=azerty,accents=grave|aigu|circonflexe|tilde|cedille|trema"
     />
 </input-method>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index f943557..2366d4e 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -9,12 +9,13 @@
       android:entries="@array/pref_layout_entries"
       android:entryValues="@array/pref_layout_values" />
     />
-    <CheckBoxPreference
-      android:key="disable_accent_keys"
-      android:title="@string/pref_disable_accent_keys_title"
-      android:summary="@string/pref_disable_accent_keys_summary"
-      android:defaultValue="false"
-    />
+    <ListPreference
+      android:key="accents"
+      android:title="@string/pref_accents_title"
+      android:summary="@string/pref_accents_summary"
+      android:defaultValue="@string/pref_accents_default"
+      android:entries="@array/pref_accents_entries"
+      android:entryValues="@array/pref_accents_values" />
 	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/pref_category_typing">
 		<juloo.common.SlideBarPreference
-- 
cgit v1.2.3