Merge branch 'master' into skintones

4 files changed, 81 insertions, 59 deletions

diff --git a/res/values/dictionaries.xml b/res/values/dictionaries.xml
index f3e73fd..418b94a 100644
--- a/res/values/dictionaries.xml
+++ b/res/values/dictionaries.xml
@@ -176,62 +176,62 @@
     <item>@string/dict_name_zgh</item>
   </string-array>
   <integer-array name="dictionaries_size">
-    <item>455658</item>
-    <item>307451</item>
-    <item>1745968</item>
-    <item>347735</item>
-    <item>301586</item>
-    <item>481783</item>
-    <item>335099</item>
-    <item>657214</item>
-    <item>933060</item>
-    <item>1071580</item>
-    <item>1075177</item>
-    <item>964195</item>
-    <item>645068</item>
-    <item>644719</item>
-    <item>650605</item>
-    <item>635119</item>
-    <item>359849</item>
-    <item>1003794</item>
-    <item>871636</item>
-    <item>240926</item>
-    <item>279333</item>
-    <item>301928</item>
-    <item>727487</item>
-    <item>331818</item>
-    <item>948362</item>
-    <item>696974</item>
-    <item>352933</item>
-    <item>488139</item>
-    <item>263411</item>
-    <item>286588</item>
-    <item>331897</item>
-    <item>736799</item>
-    <item>854603</item>
-    <item>333644</item>
-    <item>354875</item>
-    <item>301259</item>
-    <item>776481</item>
-    <item>926933</item>
-    <item>357107</item>
-    <item>107120</item>
-    <item>740895</item>
-    <item>705536</item>
-    <item>996904</item>
-    <item>1421447</item>
-    <item>907625</item>
-    <item>342293</item>
-    <item>322250</item>
-    <item>256078</item>
-    <item>228729</item>
-    <item>740293</item>
-    <item>916845</item>
-    <item>297338</item>
-    <item>304295</item>
-    <item>690598</item>
-    <item>1179318</item>
-    <item>265324</item>
-    <item>628168</item>
+    <item>1077292</item>
+    <item>311112</item>
+    <item>11487846</item>
+    <item>2211253</item>
+    <item>301784</item>
+    <item>906326</item>
+    <item>407170</item>
+    <item>1568998</item>
+    <item>1546716</item>
+    <item>2255836</item>
+    <item>2266732</item>
+    <item>2238294</item>
+    <item>965128</item>
+    <item>965329</item>
+    <item>975297</item>
+    <item>1052729</item>
+    <item>414036</item>
+    <item>1658585</item>
+    <item>1605664</item>
+    <item>357847</item>
+    <item>481771</item>
+    <item>470063</item>
+    <item>1321154</item>
+    <item>707030</item>
+    <item>928493</item>
+    <item>893066</item>
+    <item>353376</item>
+    <item>488110</item>
+    <item>263418</item>
+    <item>286778</item>
+    <item>697624</item>
+    <item>1516546</item>
+    <item>1979217</item>
+    <item>459935</item>
+    <item>354845</item>
+    <item>495624</item>
+    <item>1082569</item>
+    <item>1084717</item>
+    <item>364229</item>
+    <item>107132</item>
+    <item>1447993</item>
+    <item>1139131</item>
+    <item>1829662</item>
+    <item>2101184</item>
+    <item>2253446</item>
+    <item>610950</item>
+    <item>323065</item>
+    <item>535713</item>
+    <item>373039</item>
+    <item>1770217</item>
+    <item>1587792</item>
+    <item>297746</item>
+    <item>304874</item>
+    <item>1497533</item>
+    <item>7456277</item>
+    <item>573464</item>
+    <item>628174</item>
   </integer-array>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5eb4e85..9a60d93 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3,7 +3,7 @@
     <string name="app_name_release">Unexpected Keyboard</string>
     <string name="app_name_debug">Unexpected Keyboard (Debug)</string>
     <string name="short_description">Lightweight and privacy-conscious virtual keyboard for Android.</string>
-    <string name="store_description">The main feature is that you can type more characters by swiping the keys towards the corners.\n\nThis application was originally designed for programmers using Termux.\nNow perfect for everyday use.\n\nThis application contains no ads, doesn\'t make any network requests and is Open Source.</string>
+    <string name="store_description">The main feature is that you can type more characters by swiping the keys towards the corners.\n\nThis application was originally designed for programmers using Termux.\nNow perfect for everyday use.\n\nThis application contains no ads and is Open Source.</string>
     <string name="pref_portrait">In portrait mode</string>
     <string name="pref_portrait_unfolded">In portrait mode unfolded</string>
     <string name="pref_landscape">In landscape mode</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6977e00..9963c9e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,9 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <!-- Candidates view -->
+  <style name="candidates_view">
+    <item name="android:layout_width">match_parent</item>
+    <item name="android:layout_height">48dp</item>
+    <item name="android:orientation">horizontal</item>
+    <item name="android:gravity">center</item>
+  </style>
   <style name="candidates_item">
+    <item name="android:layout_width">match_parent</item>
+    <item name="android:layout_height">match_parent</item>
+    <item name="android:layout_weight">1</item>
     <item name="android:gravity">center</item>
     <item name="android:textColor">?attr/colorLabel</item>
+    <item name="android:layout_width">match_parent</item>
+    <item name="android:layout_height">match_parent</item>
+    <item name="android:layout_weight">1</item>
+    <item name="android:textColor">?attr/colorLabel</item>
+    <item name="android:maxLines">1</item>
+  </style>
+  <style name="candidates_emoji">
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:layout_height">match_parent</item>
+    <item name="android:layout_marginLeft">12dp</item>
+    <item name="android:layout_weight">0</item>
+    <item name="android:paddingHorizontal">@dimen/candidates_padding</item>
+    <item name="android:gravity">center</item>
   </style>
   <style name="candidates_status">
     <item name="android:layout_width">match_parent</item>
diff --git a/res/values/values.xml b/res/values/values.xml
index 9f23212..321f0b1 100644
--- a/res/values/values.xml
+++ b/res/values/values.xml
@@ -6,7 +6,7 @@
   <dimen name="emoji_text_size">28dp</dimen>
   <dimen name="clipboard_view_height">300dp</dimen>
   <dimen name="pref_button_size">28dp</dimen>
-  <dimen name="candidates_spacing">8dp</dimen>
+  <dimen name="candidates_padding">3dp</dimen>
   <!-- Will be overwritten automatically by Gradle for the debug build variant -->
   <bool name="debug_logs">false</bool>
   <!-- Color fallback for the Monet themes on Android API < 31. This makes the