abouttreesummaryrefslogcommitdiff
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout/candidates_status_no_dict.xml5
-rw-r--r--res/layout/keyboard.xml4
-rw-r--r--res/values/strings.xml5
-rw-r--r--res/values/styles.xml7
-rw-r--r--res/xml/settings.xml3
5 files changed, 21 insertions, 3 deletions
diff --git a/res/layout/candidates_status_no_dict.xml b/res/layout/candidates_status_no_dict.xml
new file mode 100644
index 0000000..6ba20b9
--- /dev/null
+++ b/res/layout/candidates_status_no_dict.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/candidates_status">
+ <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/candidates_status_no_dict"/>
+ <Button android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/candidates_status_install"/>
+</LinearLayout>
diff --git a/res/layout/keyboard.xml b/res/layout/keyboard.xml
index 82575be..f512979 100644
--- a/res/layout/keyboard.xml
+++ b/res/layout/keyboard.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:hardwareAccelerated="false" android:orientation="vertical" android:background="?attr/colorKeyboard">
- <juloo.keyboard2.CandidatesView android:id="@+id/candidates_view" android:layout_width="match_parent" android:layout_height="48dp" android:orientation="horizontal">
+ <juloo.keyboard2.suggestions.CandidatesView android:id="@+id/candidates_view" android:layout_width="match_parent" android:layout_height="48dp" android:orientation="horizontal" android:gravity="center">
<TextView android:id="@+id/candidates_left" style="@style/candidates_item" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="1"/>
<TextView android:id="@+id/candidates_middle" style="@style/candidates_item" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="1"/>
<TextView android:id="@+id/candidates_right" style="@style/candidates_item" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="1"/>
- </juloo.keyboard2.CandidatesView>
+ </juloo.keyboard2.suggestions.CandidatesView>
<juloo.keyboard2.Keyboard2View android:id="@+id/keyboard_view" android:layout_width="match_parent" android:layout_height="wrap_content"/>
</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6b1c329..e01e98f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -33,6 +33,9 @@
<string name="pref_extra_keys_title">Add keys to the keyboard</string>
<string name="pref_extra_keys_custom">Add custom keys</string>
<string name="pref_extra_keys_internal">Select keys to add to the keyboard</string>
+ <string name="pref_category_suggestions">Suggestions</string>
+ <string name="pref_suggestions_title">Suggestions</string>
+ <string name="pref_suggestions_summary">Enable word completion and spell checking</string>
<string name="pref_category_typing">Typing</string>
<string name="pref_swipe_dist_title">Swiping distance</string>
<string name="pref_swipe_dist_summary">Distance of characters in the corners of the keys (%s)</string>
@@ -151,4 +154,6 @@
<string name="pref_clipboard_history_duration_30">At most 30 minutes</string>
<string name="pref_clipboard_history_duration_stop">Until the app stops</string>
<string name="pref_dialog_edit_text">Custom definition</string>
+ <string name="candidates_status_no_dict">No dictionary installed</string>
+ <string name="candidates_status_install">Install</string>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5b00ca3..5defb7b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -3,7 +3,12 @@
<!-- Candidates view -->
<style name="candidates_item">
<item name="android:gravity">center</item>
- <item name="android:textSize">18sp</item>
+ <item name="android:textColor">?attr/colorLabel</item>
+ </style>
+ <style name="candidates_status">
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:gravity">center</item>
<item name="android:textColor">?attr/colorLabel</item>
</style>
<!-- Emoji pane -->
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 175617a..ca7aea8 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -12,6 +12,9 @@
<ListPreference android:key="show_numpad" android:title="@string/pref_show_numpad_title" android:summary="%s" android:defaultValue="1" android:entries="@array/pref_show_numpad_entries" android:entryValues="@array/pref_show_numpad_values"/>
<ListPreference android:key="numpad_layout" android:title="@string/pref_numpad_layout" android:summary="%s" android:defaultValue="high_first" android:entries="@array/pref_numpad_layout_entries" android:entryValues="@array/pref_numpad_layout_values"/>
</PreferenceCategory>
+ <PreferenceCategory android:title="@string/pref_category_suggestions">
+ <CheckBoxPreference android:key="suggestions" android:title="@string/pref_suggestions_title" android:summary="@string/pref_suggestions_summary" android:defaultValue="true"/>
+ </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"/>