diff options
39 files changed, 39 insertions, 56 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index aeae1d1..fb47a5f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -11,7 +11,7 @@ <meta-data android:name="android.view.im" android:resource="@xml/method"/> </service> - <activity android:name="juloo.keyboard2.SettingsActivity" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:theme="@style/settingsTheme" android:exported="true" android:directBootAware="true"> + <activity android:name="juloo.keyboard2.SettingsActivity" android:icon="@mipmap/ic_launcher" android:theme="@style/settingsTheme" android:exported="true" android:directBootAware="true"> <intent-filter> <action android:name="android.intent.action.MAIN"/> </intent-filter> diff --git a/build.gradle.kts b/build.gradle.kts index d357ed2..912409b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,12 +2,13 @@ import com.android.build.gradle.internal.api.BaseVariantOutputImpl import java.io.FileOutputStream plugins { - id("com.android.application") version "8.13.0" + id("com.android.application") version "8.13.2" } dependencies { - implementation("androidx.window:window-java:1.3.0") - implementation("androidx.core:core:1.16.0") + // Following versions of androidx.window require sdk version 23 + implementation("androidx.window:window-java:1.4.0") + implementation("androidx.core:core:1.16.0") // Version 1.17.0 available with sdk 36 testImplementation("junit:junit:4.13.2") } diff --git a/res/layout/dialog_edit_text.xml b/res/layout/dialog_edit_text.xml index 5b935dc..ebf61d9 100644 --- a/res/layout/dialog_edit_text.xml +++ b/res/layout/dialog_edit_text.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="wrap_content"> - <EditText android:id="@+id/text" android:inputType="text" android:importantForAutofill="no" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="10dp"/> + <EditText android:id="@+id/text" android:hint="@string/pref_dialog_edit_text" android:inputType="text" android:importantForAutofill="no" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="10dp"/> </LinearLayout> diff --git a/res/layout/launcher_activity.xml b/res/layout/launcher_activity.xml index 2273641..20df09a 100644 --- a/res/layout/launcher_activity.xml +++ b/res/layout/launcher_activity.xml @@ -6,19 +6,19 @@ <Button style="@style/paragraph" android:text="@string/launcher_button_imepicker" android:onClick="launch_imepicker" android:layout_width="wrap_content"/> <LinearLayout style="@style/anim_box"> <ImageView style="@style/anim" android:id="@+id/launcher_anim_swipe" android:background="@drawable/doc_key_u" android:src="@drawable/doc_anim_swipe"/> - <TextView style="@style/anim_text" android:text="7"/> + <TextView style="@style/anim_text" android:text="@string/launcher_anim_7"/> </LinearLayout> <LinearLayout style="@style/anim_box"> <ImageView style="@style/anim" android:id="@+id/launcher_anim_circle" android:background="@drawable/doc_key_g" android:src="@drawable/doc_anim_circle"/> - <TextView style="@style/anim_text" android:text="G"/> + <TextView style="@style/anim_text" android:text="@string/launcher_anim_g"/> </LinearLayout> <LinearLayout style="@style/anim_box"> <ImageView style="@style/anim" android:id="@+id/launcher_anim_round_trip" android:background="@drawable/doc_key_g" android:src="@drawable/doc_anim_round_trip"/> - <TextView style="@style/anim_text" android:text="–"/> + <TextView style="@style/anim_text" android:text="@string/launcher_anim_dash"/> </LinearLayout> <TextView android:id="@+id/launcher_tryhere_text" style="@style/paragraph" android:text="@string/launcher_tryhere"/> <EditText android:id="@+id/launcher_tryhere_area" style="@style/paragraph" android:inputType="text" android:hint="@string/launcher_tryhere_hint" android:importantForAutofill="no"/> <TextView style="@style/paragraph" android:text="@string/launcher_sourcecode"/> - <TextView style="@style/paragraph" android:text="https://github.com/Julow/Unexpected-Keyboard" android:autoLink="web" android:linksClickable="true"/> + <TextView style="@style/paragraph" android:text="@string/launcher_repo_url" android:autoLink="web" android:linksClickable="true"/> </LinearLayout> </ScrollView> diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 3b53714..b16a359 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -27,7 +27,6 @@ <string name="pref_show_numpad_landscape">Pouze v režimu na šířku</string> <string name="pref_show_numpad_always">Vždy</string> <string name="pref_number_row_title">Zobrazit řádek s čísly</string> - <string name="pref_number_row_summary">Přidá řádek s čísly nad klávesnici, pokud je NumPad skrytý</string> <string name="pref_numpad_layout">Rozložení NumPadu</string> <string name="pref_numpad_layout_e_high_first">Vyšší číslice jako první (horní řádek 789)</string> <string name="pref_numpad_layout_e_low_first">Nižší číslice jako první (horní řádek 123)</string> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 91f723c..9413673 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -27,7 +27,6 @@ <string name="pref_show_numpad_landscape">Nur im Querformat</string> <string name="pref_show_numpad_always">Immer</string> <string name="pref_number_row_title">Zahlenreihe anzeigen</string> - <string name="pref_number_row_summary">Eine Zahlenreihe oben an der Tastatur hinzufügen, wenn der Ziffernblock ausgeblendet ist</string> <string name="pref_numpad_layout">Zahlenblock-Layout</string> <string name="pref_numpad_layout_e_high_first">Hohe Ziffern zuerst</string> <string name="pref_numpad_layout_e_low_first">Niedrige Ziffern zuerst</string> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index f13cc13..40676b0 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -27,7 +27,6 @@ <string name="pref_show_numpad_landscape">Solo en modo horizontal</string> <string name="pref_show_numpad_always">Siempre</string> <string name="pref_number_row_title">Mostrar fila de números</string> - <string name="pref_number_row_summary">Agrega la fila numérica a la parte superior del teclado si el teclado numérico está oculto</string> <string name="pref_numpad_layout">Diseño del teclado numérico</string> <string name="pref_numpad_layout_e_high_first">Dígitos descendientes</string> <string name="pref_numpad_layout_e_low_first">Dígitos ascendientes</string> diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index e383325..a19ceab 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -27,7 +27,6 @@ <string name="pref_show_numpad_landscape">فقط در حالت افقی</string> <string name="pref_show_numpad_always">همیشه</string> <string name="pref_number_row_title">نمایش ردیف اعداد</string> - <string name="pref_number_row_summary">افزودن ردیف اعداد زمانیکه پد شمارهها پنهان است</string> <string name="pref_numpad_layout">طرح پد شمارهها</string> <string name="pref_numpad_layout_e_high_first">ابتدا اعداد بزرگ</string> <string name="pref_numpad_layout_e_low_first">ابتدا اعداد کوچک</string> diff --git a/res/values-fil/strings.xml b/res/values-fil/strings.xml index e284768..35a48ec 100644 --- a/res/values-fil/strings.xml +++ b/res/values-fil/strings.xml @@ -27,7 +27,6 @@ <string name="pref_show_numpad_landscape">Kapag nakapahiga lamang</string> <string name="pref_show_numpad_always">Palagi</string> <string name="pref_number_row_title">Ipakita ang number row</string> - <string name="pref_number_row_summary">Maglagay ng number row sa itaas ng keyboard kapag nakatago ang numpad</string> <string name="pref_numpad_layout">Layout ng NumPad</string> <string name="pref_numpad_layout_e_high_first">Pinakamataas muna</string> <string name="pref_numpad_layout_e_low_first">Pinakamababa muna</string> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index dd8030e..7d79429 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -27,7 +27,6 @@ <string name="pref_show_numpad_landscape">Seulement en mode paysage</string> <string name="pref_show_numpad_always">Toujour</string> <string name="pref_number_row_title">Rangée de chiffres</string> - <string name="pref_number_row_summary">Ajoute une rangée de chiffres en haut du clavier quand le pavé numérique est caché</string> <string name="pref_numpad_layout">Disposition du pavé numérique</string> <string name="pref_numpad_layout_e_high_first">Du plus haut au plus bas</string> <string name="pref_numpad_layout_e_low_first">Du plus bas au plus haut</string> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index a4181df..06b234b 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -27,7 +27,6 @@ <!-- <string name="pref_show_numpad_landscape">Only in landscape mode</string> --> <!-- <string name="pref_show_numpad_always">Always</string> --> <!-- <string name="pref_number_row_title">Show number row</string> --> - <!-- <string name="pref_number_row_summary">Add a number row at the top of the keyboard when the numpad is hidden</string> --> <!-- <string name="pref_numpad_layout">NumPad layout</string> --> <!-- <string name="pref_numpad_layout_e_high_first">High digits first</string> --> <!-- <string name="pref_numpad_layout_e_low_first">Low digits first</string> --> diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 001221b..acd2620 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -27,7 +27,6 @@ <string name="pref_show_numpad_landscape">Hanya dalam mode lanskap</string> <string name="pref_show_numpad_always">Selalu</string> <string name="pref_number_row_title">Tampilkan baris nomor</string> - <string name="pref_number_row_summary">Menambahkan baris angka di bagian atas keyboard saat numpad disembunyikan</string> <string name="pref_numpad_layout">Tata letak NumPad</string> <string name="pref_numpad_layout_e_high_first">digit tinggi dulu</string> <string name="pref_numpad_layout_e_low_first">digit rendah dulu</string> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index a046dd2..abb02f1 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -27,7 +27,6 @@ <string name="pref_show_numpad_landscape">Solo in modalita` orizzontale</string> <string name="pref_show_numpad_always">Sempre</string> <string name="pref_number_row_title">Mostrare la riga dei numeri</string> - <string name="pref_number_row_summary">Aggiungere una riga dei numeri sopra la tastiera quando il tastierino numerico e\' nascosto</string> <string name="pref_numpad_layout">Layout del yadtierino numerico</string> <string name="pref_numpad_layout_e_high_first">Prima i numeri piu` alti</string> <string name="pref_numpad_layout_e_low_first">Prima i numeri piu` bassi</string> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index c1af875..6ccefb3 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -27,7 +27,6 @@ <string name="pref_show_numpad_landscape">横向きの時は表示</string> <string name="pref_show_numpad_always">表示する</string> <string name="pref_number_row_title">数字の行を表示</string> - <string name="pref_number_row_summary">テンキーが非表示の場合最上段に数字の行を追加します</string> <string name="pref_numpad_layout">テンキーのレイアウト</string> <string name="pref_numpad_layout_e_high_first">大きい数字を上に</string> <string name="pref_numpad_layout_e_low_first">小さい数字を上に</string> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index c572341..7e40d85 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -27,7 +27,6 @@ <string name="pref_show_numpad_landscape">가로 모드에서만</string> <string name="pref_show_numpad_always">항상</string> <string name="pref_number_row_title">숫자 열 표시</string> - <string name="pref_number_row_summary">NumPad이 숨겨진 경우 키보드 상단에 숫자 행을 추가합니다.</string> <string name="pref_numpad_layout">NumPad 레이아웃</string> <string name="pref_numpad_layout_e_high_first">높은 자리수 우선</string> <string name="pref_numpad_layout_e_low_first">낮은 자리수 우선</string> diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 69b36cb..1b67f2d 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -27,7 +27,6 @@ <string name="pref_show_numpad_landscape">Tikai līmeniskajā stāvoklī</string> <string name="pref_show_numpad_always">Vienmēr</string> <string name="pref_number_row_title">Rādīt ciparu rindu</string> - <string name="pref_number_row_summary">Pievienot ciparu rindu virs tastatūras, kad ciparnīca ir paslēpta</string> <string name="pref_numpad_layout">Ciparnīcas izkārtojums</string> <string name="pref_numpad_layout_e_high_first">Lielie cipari augšā</string> <string name="pref_numpad_layout_e_low_first">Mazie cipari augšā</string> diff --git a/res/values-night-v21/styles.xml b/res/values-night-v21/styles.xml deleted file mode 100644 index 9daa919..0000000 --- a/res/values-night-v21/styles.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <style name="appTheme" parent="@android:style/Theme.Material"/> -</resources> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 1767e54..5445acf 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -27,7 +27,6 @@ <string name="pref_show_numpad_landscape">Alleen in liggende stand</string> <string name="pref_show_numpad_always">Altijd</string> <string name="pref_number_row_title">Toon getallenrij</string> - <string name="pref_number_row_summary">Voeg getallenrij toe aan de bovenkant van het toetsenbord als het Num-Pad verborgen is</string> <string name="pref_numpad_layout">NumPad lay-out</string> <string name="pref_numpad_layout_e_high_first">Hoogste cijfers eerst</string> <string name="pref_numpad_layout_e_low_first">Laagste cijfers eerst</string> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 9a3ece3..2116ea0 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -27,7 +27,6 @@ <string name="pref_show_numpad_landscape">Tylko w orientacji poziomej</string> <string name="pref_show_numpad_always">Zawsze</string> <string name="pref_number_row_title">Pokaż rząd cyfr</string> - <string name="pref_number_row_summary">Dodaj rząd cyfr na górze klawiatury, kiedy klaw. numeryczna jest schowana</string> <string name="pref_numpad_layout">Układ klawiatury numerycznej</string> <string name="pref_numpad_layout_e_high_first">Od największej cyfry</string> <string name="pref_numpad_layout_e_low_first">Od najmniejszej cyfry</string> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 9751ee9..c516d7d 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -27,7 +27,6 @@ <string name="pref_show_numpad_landscape">Somente no modo paisagem</string> <string name="pref_show_numpad_always">Sempre</string> <string name="pref_number_row_title">Mostrar fileira de números</string> - <string name="pref_number_row_summary">Adicionar uma linha de números no topo do teclado quando o teclado numérico estiver oculto</string> <string name="pref_numpad_layout">Layout do teclado numérico</string> <string name="pref_numpad_layout_e_high_first">Dígitos maiores primeiro</string> <string name="pref_numpad_layout_e_low_first">Dígitos menores primeiro</string> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 1699408..dd769b4 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -27,7 +27,6 @@ <string name="pref_show_numpad_landscape">Doar în mod panoramă</string> <string name="pref_show_numpad_always">Întotdeanuna</string> <string name="pref_number_row_title">Arată rândul cu numere</string> - <string name="pref_number_row_summary">Adaugă un rând deasupra tastaturii când numpad-ul este ascuns</string> <string name="pref_numpad_layout">Aspect NumPad</string> <string name="pref_numpad_layout_e_high_first">Mai întâi cifrele mari</string> <string name="pref_numpad_layout_e_low_first">Mai întâi cifrele mici</string> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 8d7dfb9..5497dfd 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -27,7 +27,6 @@ <string name="pref_show_numpad_landscape">Только в ландшафтном режиме</string> <string name="pref_show_numpad_always">Всегда</string> <string name="pref_number_row_title">Показывать цифры</string> - <string name="pref_number_row_summary">Добавить ряд цифр над клавиатурой, когда цифровой блок не активен</string> <string name="pref_numpad_layout">Раскладка цифрового блока</string> <string name="pref_numpad_layout_e_high_first">Старшие цифры сверху</string> <string name="pref_numpad_layout_e_low_first">Младшие цифры сверху</string> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 19c820e..b16da3b 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -27,7 +27,6 @@ <string name="pref_show_numpad_landscape">Sadece manzara modunda</string> <string name="pref_show_numpad_always">Her zaman</string> <string name="pref_number_row_title">Rakam satırını göster</string> - <string name="pref_number_row_summary">NumPad gizlendiğinde klavyenin üstüne rakam satırı ekle</string> <string name="pref_numpad_layout">NumPad düzeni</string> <string name="pref_numpad_layout_e_high_first">9dan 1e</string> <string name="pref_numpad_layout_e_low_first">1den 9a</string> diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 8161225..af160c2 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -27,7 +27,6 @@ <string name="pref_show_numpad_landscape">Тільки в альбомному режимі</string> <string name="pref_show_numpad_always">Завжди</string> <string name="pref_number_row_title">Показувати рядок чисел</string> - <string name="pref_number_row_summary">Додати рядок чисел у верхній частині клавіатури, коли числову клавіатуру приховано</string> <string name="pref_numpad_layout">Макет числової клавіатури</string> <string name="pref_numpad_layout_e_high_first">Від найбільшої цифри</string> <string name="pref_numpad_layout_e_low_first">Від найменшої цифри</string> diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml deleted file mode 100644 index 56a4b58..0000000 --- a/res/values-v21/styles.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <style name="appTheme" parent="@android:style/Theme.Material.Light"/> -</resources> diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index e36f71d..1723019 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -27,7 +27,6 @@ <string name="pref_show_numpad_landscape">Chỉ trong chế độ phong cảnh</string> <string name="pref_show_numpad_always">Luôn luôn</string> <string name="pref_number_row_title">Hiện số dòng</string> - <string name="pref_number_row_summary">Hiện số dòng trên đầu bàn phím khi NumPad ẩn</string> <string name="pref_numpad_layout">Bố cục NumPad</string> <string name="pref_numpad_layout_e_high_first">Số lớn nhất trước</string> <string name="pref_numpad_layout_e_low_first">Số nhỏ nhất trước</string> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 9902a40..c2cd60b 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -27,7 +27,6 @@ <string name="pref_show_numpad_landscape">只在横屏显示</string> <string name="pref_show_numpad_always">一直显示</string> <string name="pref_number_row_title">显示数字行</string> - <string name="pref_number_row_summary">当数字小键盘隐藏时，在键盘上方显示数字按键</string> <string name="pref_numpad_layout">数字小键盘布局</string> <string name="pref_numpad_layout_e_high_first">大数字在上方</string> <string name="pref_numpad_layout_e_low_first">小数字在上方</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index 975b699..0a7faf4 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -27,7 +27,6 @@ <string name="pref_show_numpad_landscape">Only in landscape mode</string> <string name="pref_show_numpad_always">Always</string> <string name="pref_number_row_title">Show number row</string> - <string name="pref_number_row_summary">Add a number row at the top of the keyboard when the numpad is hidden</string> <string name="pref_numpad_layout">NumPad layout</string> <string name="pref_numpad_layout_e_high_first">High digits first</string> <string name="pref_numpad_layout_e_low_first">Low digits first</string> @@ -149,4 +148,5 @@ <string name="pref_clipboard_history_duration_5">At most 5 minutes</string> <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> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index f592cd7..9763c04 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -79,7 +79,7 @@ <item name="android:layout_width">wrap_content</item> <item name="android:orientation">horizontal</item> </style> - <style name="appTheme" parent="@android:style/Theme.DeviceDefault.DayNight"/> + <style name="appTheme" parent="@android:style/Theme.Material.Light"/> <style name="settingsTheme" parent="appTheme"> <!-- Setting this in the activity theme so it propagate to nested preference screens. --> diff --git a/res/values/untranslated_strings.xml b/res/values/untranslated_strings.xml new file mode 100644 index 0000000..0904558 --- /dev/null +++ b/res/values/untranslated_strings.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <!-- String constants that should not be translated. + It is mostly meant to silence the linter checks. --> + <string name="launcher_anim_7">7</string> + <string name="launcher_anim_g">G</string> + <string name="launcher_anim_dash">-</string> + <string name="launcher_repo_url">https://github.com/Julow/Unexpected-Keyboard</string> +</resources> diff --git a/srcs/juloo.keyboard2/ClipboardPinView.java b/srcs/juloo.keyboard2/ClipboardPinView.java index 26833d6..65f2f44 100644 --- a/srcs/juloo.keyboard2/ClipboardPinView.java +++ b/srcs/juloo.keyboard2/ClipboardPinView.java @@ -86,7 +86,7 @@ public final class ClipboardPinView extends NonScrollListView arr.put(entries.get(i)); store.edit() .putString(PERSIST_PREF, arr.toString()) - .commit(); + .apply(); } class ClipboardPinEntriesAdapter extends BaseAdapter diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java index 577ace5..64e2d87 100644 --- a/srcs/juloo.keyboard2/Config.java +++ b/srcs/juloo.keyboard2/Config.java @@ -207,7 +207,7 @@ public final class Config public void set_clipboard_history_enabled(boolean e) { clipboard_history_enabled = e; - _prefs.edit().putBoolean("clipboard_history_enabled", e).commit(); + _prefs.edit().putBoolean("clipboard_history_enabled", e).apply(); } private float get_dip_pref(DisplayMetrics dm, String pref_name, float def) diff --git a/srcs/juloo.keyboard2/CustomLayoutEditDialog.java b/srcs/juloo.keyboard2/CustomLayoutEditDialog.java index f051668..d63cf40 100644 --- a/srcs/juloo.keyboard2/CustomLayoutEditDialog.java +++ b/srcs/juloo.keyboard2/CustomLayoutEditDialog.java @@ -96,6 +96,9 @@ public class CustomLayoutEditDialog _on_change_listener = l; } + /** A mutable Rect object that is used during onDraw. */ + Rect _clip_bounds = new Rect(); + @Override protected void onDraw(Canvas canvas) { @@ -105,17 +108,17 @@ public class CustomLayoutEditDialog setPadding((int)(((int)Math.log10(line_count) + 1 + 1) * digit_width), 0, 0, 0); super.onDraw(canvas); _ln_paint.setColor(getPaint().getColor()); - Rect clip_bounds = canvas.getClipBounds(); + canvas.getClipBounds(_clip_bounds); Layout layout = getLayout(); - int offset = clip_bounds.left + (int)(digit_width / 2.f); - int line = layout.getLineForVertical(clip_bounds.top); + int offset = _clip_bounds.left + (int)(digit_width / 2.f); + int line = layout.getLineForVertical(_clip_bounds.top); int skipped = line; while (line < line_count) { int baseline = getLineBounds(line, null); canvas.drawText(String.valueOf(line), offset, baseline, _ln_paint); line++; - if (baseline >= clip_bounds.bottom) + if (baseline >= _clip_bounds.bottom) break; } } diff --git a/srcs/juloo.keyboard2/DirectBootAwarePreferences.java b/srcs/juloo.keyboard2/DirectBootAwarePreferences.java index df1612e..4806788 100644 --- a/srcs/juloo.keyboard2/DirectBootAwarePreferences.java +++ b/srcs/juloo.keyboard2/DirectBootAwarePreferences.java @@ -1,6 +1,5 @@ package juloo.keyboard2; -import android.annotation.TargetApi; import android.content.Context; import android.content.SharedPreferences; import android.os.Build.VERSION; @@ -8,7 +7,6 @@ import android.preference.PreferenceManager; import java.util.Map; import java.util.Set; -@TargetApi(24) public final class DirectBootAwarePreferences { /* On API >= 24, preferences are read from the device protected storage. This diff --git a/srcs/juloo.keyboard2/FoldStateTracker.java b/srcs/juloo.keyboard2/FoldStateTracker.java index 60933c9..f112243 100644 --- a/srcs/juloo.keyboard2/FoldStateTracker.java +++ b/srcs/juloo.keyboard2/FoldStateTracker.java @@ -2,6 +2,7 @@ package juloo.keyboard2; import android.content.Context; import android.content.pm.PackageManager; +import android.os.Build.VERSION; import androidx.window.java.layout.WindowInfoTrackerCallbackAdapter; import androidx.window.layout.DisplayFeature; import androidx.window.layout.FoldingFeature; @@ -24,6 +25,8 @@ public class FoldStateTracker { } public static boolean isFoldableDevice(Context context) { + if (VERSION.SDK_INT < 30) + return false; return context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_SENSOR_HINGE_ANGLE); } diff --git a/srcs/juloo.keyboard2/KeyEventHandler.java b/srcs/juloo.keyboard2/KeyEventHandler.java index 21a60c1..fc3a641 100644 --- a/srcs/juloo.keyboard2/KeyEventHandler.java +++ b/srcs/juloo.keyboard2/KeyEventHandler.java @@ -456,7 +456,7 @@ public final class KeyEventHandler if (et == null) return; final int curs = et.selectionStart; // Notify the receiver as Android's [onUpdateSelection] is not triggered. - if (conn.setSelection(curs, curs)); + if (conn.setSelection(curs, curs)) _recv.selection_state_changed(false); } diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java index f0408e0..1efe0f5 100644 --- a/srcs/juloo.keyboard2/Keyboard2.java +++ b/srcs/juloo.keyboard2/Keyboard2.java @@ -1,6 +1,5 @@ package juloo.keyboard2; -import android.annotation.TargetApi; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; @@ -139,7 +138,6 @@ public class Keyboard2 extends InputMethodService return Arrays.asList(); } - @TargetApi(12) private ExtraKeys extra_keys_of_subtype(InputMethodSubtype subtype) { String extra_keys = subtype.getExtraValueOf("extra_keys"); @@ -162,7 +160,6 @@ public class Keyboard2 extends InputMethodService return (InputMethodManager)getSystemService(INPUT_METHOD_SERVICE); } - @TargetApi(12) private InputMethodSubtype defaultSubtypes(InputMethodManager imm, List<InputMethodSubtype> enabled_subtypes) { if (VERSION.SDK_INT < 24) diff --git a/srcs/juloo.keyboard2/Keyboard2View.java b/srcs/juloo.keyboard2/Keyboard2View.java index 1532970..58c689d 100644 --- a/srcs/juloo.keyboard2/Keyboard2View.java +++ b/srcs/juloo.keyboard2/Keyboard2View.java @@ -18,6 +18,7 @@ import android.view.WindowInsets; import android.view.WindowManager; import android.view.WindowMetrics; import java.util.Arrays; +import java.util.List; public class Keyboard2View extends View implements View.OnTouchListener, Pointers.IPointerEventHandler @@ -292,6 +293,8 @@ public class Keyboard2View extends View setMeasuredDimension(width, height); } + Rect _cached_exclusion_rect = new Rect(); + List<Rect> _cached_exclusion_rects = Arrays.asList(_cached_exclusion_rect); @Override public void onLayout(boolean changed, int left, int top, int right, int bottom) { @@ -300,12 +303,12 @@ public class Keyboard2View extends View if (VERSION.SDK_INT >= 29) { // Disable the back-gesture on the keyboard area - Rect keyboard_area = new Rect( + _cached_exclusion_rect.set( left + (int)_marginLeft, top + (int)_config.marginTop, right - (int)_marginRight, bottom - (int)_marginBottom); - setSystemGestureExclusionRects(Arrays.asList(keyboard_area)); + setSystemGestureExclusionRects(_cached_exclusion_rects); } } diff --git a/srcs/juloo.keyboard2/LauncherActivity.java b/srcs/juloo.keyboard2/LauncherActivity.java index 3a039c1..ee769fb 100644 --- a/srcs/juloo.keyboard2/LauncherActivity.java +++ b/srcs/juloo.keyboard2/LauncherActivity.java @@ -1,6 +1,5 @@ package juloo.keyboard2; -import android.annotation.TargetApi; import android.app.Activity; import android.content.Intent; import android.graphics.drawable.Animatable; @@ -103,7 +102,6 @@ public class LauncherActivity extends Activity implements Handler.Callback return (Animatable)img.getDrawable(); } - @TargetApi(28) final class Tryhere_OnUnhandledKeyEventListener implements View.OnUnhandledKeyEventListener { public boolean onUnhandledKeyEvent(View v, KeyEvent ev) |