diff --git a/app/src/main/java/eur/cfpifpsi/titanboard/input/MetaKey.java b/app/src/main/java/eur/cfpifpsi/titanboard/MetaKey.java similarity index 98% rename from app/src/main/java/eur/cfpifpsi/titanboard/input/MetaKey.java rename to app/src/main/java/eur/cfpifpsi/titanboard/MetaKey.java index 315c0a5..bf437e3 100644 --- a/app/src/main/java/eur/cfpifpsi/titanboard/input/MetaKey.java +++ b/app/src/main/java/eur/cfpifpsi/titanboard/MetaKey.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package eur.cfpifpsi.titanboard.input; +package eur.cfpifpsi.titanboard; import android.view.KeyEvent; diff --git a/app/src/main/java/eur/cfpifpsi/titanboard/input/MetaKeyManager.java b/app/src/main/java/eur/cfpifpsi/titanboard/MetaKeyManager.java similarity index 98% rename from app/src/main/java/eur/cfpifpsi/titanboard/input/MetaKeyManager.java rename to app/src/main/java/eur/cfpifpsi/titanboard/MetaKeyManager.java index 18ec9b7..87b1fad 100644 --- a/app/src/main/java/eur/cfpifpsi/titanboard/input/MetaKeyManager.java +++ b/app/src/main/java/eur/cfpifpsi/titanboard/MetaKeyManager.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package eur.cfpifpsi.titanboard.input; +package eur.cfpifpsi.titanboard; import android.os.Vibrator; import android.view.KeyEvent; diff --git a/app/src/main/java/eur/cfpifpsi/titanboard/TitanboardIME.java b/app/src/main/java/eur/cfpifpsi/titanboard/TitanboardIME.java index 43e22c4..aa70b11 100644 --- a/app/src/main/java/eur/cfpifpsi/titanboard/TitanboardIME.java +++ b/app/src/main/java/eur/cfpifpsi/titanboard/TitanboardIME.java @@ -30,7 +30,6 @@ import android.view.inputmethod.InputConnection; import java.util.ArrayList; -import eur.cfpifpsi.titanboard.input.MetaKeyManager; import eur.cfpifpsi.titanboard.input.SymbolInputHandler; import eur.cfpifpsi.titanboard.keymapping.KeymapManager; import eur.cfpifpsi.titanboard.views.InputView; @@ -43,6 +42,7 @@ import eur.cfpifpsi.titanboard.views.InputView; // TODO: Fix up the tweaks popup so it matches in style other UI elements // TODO: Call answering/rejecting like in Pocketboard // TODO: Floating input view +// TODO: Make the IME work after reboot, e.g. to type in passwords public class TitanboardIME extends InputMethodService { private MetaKeyManager mMetaKeyManager; @@ -67,9 +67,11 @@ public class TitanboardIME extends InputMethodService { @Override public void onInitializeInterface() { mInputView = (InputView) getLayoutInflater().inflate(R.layout.input, null); + // These things shouldn't depend on one another like that, this is bound to break + // something badly. + mClipManager = new ClipManager(this, mPreferenceHolder, mInputView); mInputView.setDependencies(mKeymapManager, mMetaKeyManager, mPreferenceHolder, mClipManager); mSymbolInputHandler = new SymbolInputHandler(mInputView, mVibrator); - mClipManager = new ClipManager(this, mPreferenceHolder, mInputView); mInputView.updateStateText(); mInputView.setSymbolsVisible(false); } diff --git a/app/src/main/java/eur/cfpifpsi/titanboard/keymapping/Keymap.java b/app/src/main/java/eur/cfpifpsi/titanboard/keymapping/Keymap.java index 078372a..ed094f1 100644 --- a/app/src/main/java/eur/cfpifpsi/titanboard/keymapping/Keymap.java +++ b/app/src/main/java/eur/cfpifpsi/titanboard/keymapping/Keymap.java @@ -21,7 +21,7 @@ package eur.cfpifpsi.titanboard.keymapping; import java.util.ArrayList; import java.util.HashMap; -import eur.cfpifpsi.titanboard.input.MetaKeyManager; +import eur.cfpifpsi.titanboard.MetaKeyManager; public class Keymap { private final static int INITIAL_KEYMAP_SIZE = 64; // Enough for just about any QWERTY. diff --git a/app/src/main/java/eur/cfpifpsi/titanboard/keymapping/KeymapManager.java b/app/src/main/java/eur/cfpifpsi/titanboard/keymapping/KeymapManager.java index ad49338..d50519d 100644 --- a/app/src/main/java/eur/cfpifpsi/titanboard/keymapping/KeymapManager.java +++ b/app/src/main/java/eur/cfpifpsi/titanboard/keymapping/KeymapManager.java @@ -25,7 +25,7 @@ import java.util.HashMap; import java.util.List; import eur.cfpifpsi.titanboard.R; -import eur.cfpifpsi.titanboard.input.MetaKeyManager; +import eur.cfpifpsi.titanboard.MetaKeyManager; public class KeymapManager { private final Context mContext; diff --git a/app/src/main/java/eur/cfpifpsi/titanboard/views/InputView.java b/app/src/main/java/eur/cfpifpsi/titanboard/views/InputView.java index 46e8f91..0747e07 100644 --- a/app/src/main/java/eur/cfpifpsi/titanboard/views/InputView.java +++ b/app/src/main/java/eur/cfpifpsi/titanboard/views/InputView.java @@ -35,7 +35,7 @@ import eur.cfpifpsi.titanboard.PreferenceHolder; import eur.cfpifpsi.titanboard.R; import eur.cfpifpsi.titanboard.SettingsActivity; import eur.cfpifpsi.titanboard.TitanboardIME; -import eur.cfpifpsi.titanboard.input.MetaKeyManager; +import eur.cfpifpsi.titanboard.MetaKeyManager; import eur.cfpifpsi.titanboard.keymapping.KeymapManager; public final class InputView extends RelativeLayout { diff --git a/app/src/main/java/eur/cfpifpsi/titanboard/views/StateButton.java b/app/src/main/java/eur/cfpifpsi/titanboard/views/StateButton.java index f78f1d5..846ec8b 100644 --- a/app/src/main/java/eur/cfpifpsi/titanboard/views/StateButton.java +++ b/app/src/main/java/eur/cfpifpsi/titanboard/views/StateButton.java @@ -24,7 +24,7 @@ import android.util.AttributeSet; import android.widget.Button; import eur.cfpifpsi.titanboard.R; -import eur.cfpifpsi.titanboard.input.MetaKey; +import eur.cfpifpsi.titanboard.MetaKey; public class StateButton extends Button { public StateButton(Context context, AttributeSet attrs) { diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index b3391d4..3acd574 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -27,6 +27,8 @@ Russian (Phonetic) Greek (diacritics under Q) Arabic (Phonetic) + Hebrew + Czech @@ -39,6 +41,8 @@ ru el ar + he + cz diff --git a/app/src/main/res/xml/language_keymaps.xml b/app/src/main/res/xml/language_keymaps.xml index c6d2fbb..49a959d 100644 --- a/app/src/main/res/xml/language_keymaps.xml +++ b/app/src/main/res/xml/language_keymaps.xml @@ -1536,4 +1536,341 @@ ظ + + + he + He + HE + + + - + ־ + + + ' + ׳ + + + " + ” + ״ + + + , + ֽ + + + . + ׃ + + + $ + ₪ + + + + 29 + ש + ְ + + + 30 + נ + + + 31 + ב + ֱ + + + 32 + ג + + + 33 + ק + ָ + + + 34 + כ + ֿ + + + 35 + ע + + + 36 + י + + + 37 + ן + + + 38 + ח + ִ + + + 39 + ל + + + 40 + ך + + + 41 + צ + ץ + ֵ + + + 42 + מ + + + 43 + ם + + + 44 + פ + ף + ַ + ֲ + + + 55 + ׂ + + + 46 + ר + ֳ + + + 47 + ד + ּ + + + 48 + א + + + 49 + ו + וּ + ֹ + ֻ + + + 50 + ה + + + 51 + ׁ + + + 52 + ס + ֶ + + + 53 + ט + ת + + + 54 + ז + + + + + cz + Cz + CZ + + + " + „ + “ + » + « + + + ' + ’ + ‚ + ‘ + + + + 29 + a + á + A + Á + + + 30 + b + B + + + 31 + c + č + C + Č + + + 32 + d + ď + D + Ď + + + 33 + e + é + ě + E + É + Ě + + + 34 + f + F + + + 35 + g + G + + + 36 + h + H + + + 37 + i + í + I + Í + + + 38 + j + J + + + 39 + k + K + + + 40 + l + ł + L + Ł + + + 41 + m + M + + + 42 + n + ň + N + Ň + + + 43 + o + ó + O + Ó + + + 44 + p + P + + + 45 + q + Q + + + 46 + r + ř + R + Ř + + + 47 + s + š + S + Š + + + 48 + t + ť + T + Ť + + + 49 + u + ú + ů + U + Ú + Ů + + + 50 + v + V + + + 51 + w + W + + + 52 + x + X + + + 53 + y + ý + Y + Ý + + + 54 + z + ž + Z + Ž + + \ No newline at end of file