res/raw/cj5.db res/xml/kb_cj.xml src/idv/Zero/KerKerInput/Keyboard.java src/idv/Zero/KerKerInput/Methods/CJInput.java src/idv/Zero/KerKerInput/SettingsListAdapter.java tools/cin2db.rb @@ -1 +1,4 @@ bin +.DS_Store +bak +noseeing.db .gitignore @@ -3,7 +3,7 @@ package="idv.Zero.KerKerInput" android:versionCode="1" android:versionName="1.0"> - <application android:icon="@drawable/icon" android:label="@string/app_name"> + <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="true"> <service android:name=".KerKerInputService" android:permission="android.permission.BIND_INPUT_METHOD"> <intent-filter> <action android:name="android.view.InputMethod" /> AndroidManifest.xml @@ -61,12 +61,12 @@ public final class R { } public static final class id { public static final int LinearLayout01=0x7f080005; - public static final int TextView01=0x7f080006; public static final int btn_left=0x7f080001; public static final int btn_right=0x7f080004; public static final int candidates=0x7f080002; public static final int layout_btn_left=0x7f080000; public static final int layout_btn_right=0x7f080003; + public static final int lstSettings=0x7f080006; public static final int mode_email=0x7f080008; public static final int mode_im=0x7f080009; public static final int mode_normal=0x7f08000a; @@ -79,7 +79,8 @@ public final class R { } public static final class raw { public static final int bpmf=0x7f050000; - public static final int noseeing=0x7f050001; + public static final int cj5=0x7f050001; + public static final int noseeing=0x7f050002; } public static final class string { public static final int app_name=0x7f070000; @@ -91,15 +92,16 @@ public final class R { public static final int update_str=0x7f070001; } public static final class xml { - public static final int kb_noseeing=0x7f040000; - public static final int kb_zhuyin=0x7f040001; - public static final int kbd_popup_template=0x7f040002; - public static final int kbd_qwerty=0x7f040003; - public static final int kbd_sym=0x7f040004; - public static final int kbd_sym_alt=0x7f040005; - public static final int method=0x7f040006; - public static final int popup_domains=0x7f040007; - public static final int popup_punctuation=0x7f040008; - public static final int popup_smileys=0x7f040009; + public static final int kb_cj=0x7f040000; + public static final int kb_noseeing=0x7f040001; + public static final int kb_zhuyin=0x7f040002; + public static final int kbd_popup_template=0x7f040003; + public static final int kbd_qwerty=0x7f040004; + public static final int kbd_sym=0x7f040005; + public static final int kbd_sym_alt=0x7f040006; + public static final int method=0x7f040007; + public static final int popup_domains=0x7f040008; + public static final int popup_punctuation=0x7f040009; + public static final int popup_smileys=0x7f04000a; } } gen/idv/Zero/KerKerInput/R.java @@ -1,3 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout android:id="@+id/LinearLayout01" android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android" android:layout_gravity="center_vertical|center_horizontal"><TextView android:id="@+id/TextView01" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="28dp" android:layout_gravity="center_vertical|center_horizontal" android:text="本版本為 mobilehero 特製版本，無任何設定選項。"></TextView> +<LinearLayout android:id="@+id/LinearLayout01" android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android" android:layout_gravity="center_vertical|center_horizontal"> +<ListView android:id="@+id/lstSettings" android:layout_width="fill_parent" android:layout_height="fill_parent"></ListView> </LinearLayout> res/layout/settings.xml @@ -88,7 +88,7 @@ <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left"/> <Key android:keyLabel=".com" android:keyOutputText=".com" android:popupKeyboard="@xml/popup_domains" android:keyWidth="15%p"/> @@ -100,14 +100,18 @@ android:keyWidth="15%p"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="15%p"/> + <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete" + android:keyWidth="10%p" android:isRepeatable="true" + android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="10%p" android:keyEdgeFlags="left"/> <Key android:keyLabel="," android:keyWidth="15%p" /> <Key android:keyLabel="\@" android:keyWidth="15%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" @@ -117,7 +121,11 @@ android:keyWidth="15%p"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="20%p"/> + <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete" + android:keyWidth="10%p" android:isRepeatable="true" + android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> res/xml/kbd_qwerty.xml @@ -29,6 +29,6 @@ <Key android:keyLabel=".net" android:keyOutputText=".net" android:keyEdgeFlags="left" /> <Key android:keyLabel=".org" android:keyOutputText=".org"/> <Key android:keyLabel=".gov" android:keyOutputText=".gov"/> - <Key android:keyLabel=".tv" android:keyOutputText=".tv" android:keyEdgeFlags="right" /> + <Key android:keyLabel=".tw" android:keyOutputText=".tw" android:keyEdgeFlags="right" /> </Row> </Keyboard> res/xml/popup_domains.xml @@ -1,7 +1,5 @@ package idv.Zero.KerKerInput; -import android.inputmethodservice.Keyboard; - public abstract class IKerKerInputMethod { protected KerKerInputCore _core; @@ -15,6 +13,7 @@ public abstract class IKerKerInputMethod { } abstract public void destroyInputMethod(); abstract public String getName(); + abstract public void commitCurrentComposingBuffer(); /* Keyboard Events */ public Keyboard getDesiredKeyboard() { return null; } src/idv/Zero/KerKerInput/IKerKerInputMethod.java @@ -1,7 +1,7 @@ package idv.Zero.KerKerInput; -import android.inputmethodservice.Keyboard; import android.inputmethodservice.KeyboardView; +import android.view.inputmethod.EditorInfo; public class KBManager { public static final int KEYCODE_SYM = -100; @@ -18,12 +18,15 @@ public class KBManager { private KerKerInputCore _core = null; private KeyboardView _currentKBView = null; private Keyboard _currentKB = null; + private int _kbMode = R.id.mode_normal; + private int imeOptions = 0; + private NativeKeyboardTypes _currentKBType = NativeKeyboardTypes.MODE_ABC; public KBManager(KerKerInputCore core) { _core = core; } - + public KeyboardView getCurrentKeyboardView() { if (_currentKBView == null) @@ -39,25 +42,26 @@ public class KBManager { public Keyboard getCurrentKeyboard() { if (_currentKB == null) - _core.requestNextInputMethod(); + setNativeKeyboard(NativeKeyboardTypes.MODE_ABC); return _currentKB; } public enum NativeKeyboardTypes {MODE_ABC, MODE_SYM, MODE_SYM_ALT, MODE_IME}; - public void setNativeKeyboard(NativeKeyboardTypes mode) + public void setNativeKeyboard(NativeKeyboardTypes type) { - switch(mode) + _currentKBType = type; + switch(type) { case MODE_ABC: - setCurrentKeyboardFromResource(R.xml.kbd_qwerty, R.id.mode_normal); + setCurrentKeyboardFromResource(R.xml.kbd_qwerty, getKeyboardMode()); break; case MODE_SYM: - setCurrentKeyboardFromResource(R.xml.kbd_sym, R.id.mode_normal); + setCurrentKeyboardFromResource(R.xml.kbd_sym, getKeyboardMode()); break; case MODE_SYM_ALT: - setCurrentKeyboardFromResource(R.xml.kbd_sym_alt, R.id.mode_normal); + setCurrentKeyboardFromResource(R.xml.kbd_sym_alt, getKeyboardMode()); break; case MODE_IME: setCurrentKeyboard(_core.getCurrentInputMethod().getDesiredKeyboard()); @@ -76,4 +80,39 @@ public class KBManager { if (_currentKBView != null) // It will be null if it's first run. _currentKBView.setKeyboard(_currentKB); } + + public void setKeyboardMode(int kbmode) + { + _kbMode = kbmode; + setNativeKeyboard(_currentKBType); + } + + public int getKeyboardMode() + { + return _kbMode; + } + + public void setImeOptions(int inputType) + { + imeOptions = inputType; + applyIMEOptions(); + } + + public void applyIMEOptions() + { + getCurrentKeyboard().setImeOptions(_core.getFrontend().getResources(), imeOptions); + + int variation = imeOptions & EditorInfo.TYPE_MASK_VARIATION; + switch (variation) + { + case EditorInfo.TYPE_TEXT_VARIATION_URI: + setKeyboardMode(R.id.mode_url); + break; + case EditorInfo.TYPE_TEXT_VARIATION_EMAIL_ADDRESS: + setKeyboardMode(R.id.mode_email); + break; + default: + setKeyboardMode(R.id.mode_normal); + } + } } src/idv/Zero/KerKerInput/KBManager.java @@ -41,7 +41,7 @@ public class KerKerInputCore implements OnKeyboardActionListener { _kbm = new KBManager(this); _methods = new ArrayList<IKerKerInputMethod>(); _currentMethod = null; - _currentMode = InputMode.MODE_IME; + _currentMode = InputMode.MODE_ABC; _handler = new Handler(); _pntText = new Paint(); @@ -60,15 +60,15 @@ public class KerKerInputCore implements OnKeyboardActionListener { _winMsg.setContentView(_txtvMsg); registerAvailableInputMethods(); - - requestNextInputMethod(); } public void registerAvailableInputMethods() { IKerKerInputMethod m; + m = new idv.Zero.KerKerInput.Methods.BPMFInput(); + _methods.add(m); m = new idv.Zero.KerKerInput.Methods.NoSeeing(); _methods.add(m); - m = new idv.Zero.KerKerInput.Methods.BPMFInput(); + m = new idv.Zero.KerKerInput.Methods.CJInput(); _methods.add(m); } @@ -139,7 +139,7 @@ public class KerKerInputCore implements OnKeyboardActionListener { if (e.getKeyCode() == KeyEvent.KEYCODE_BACK) return false; - if (_currentMethod.wantHandleEvent(e.getKeyCode())) + if (_currentMethod != null && _currentMethod.wantHandleEvent(e.getKeyCode())) _currentMethod.onKeyEvent(keyCode, new int[]{keyCode}); else { @@ -182,11 +182,14 @@ public class KerKerInputCore implements OnKeyboardActionListener { } else if (primaryCode == KBManager.KEYCODE_DO_OUTPUT_CHARS) return; // Let IME onText listener handle it. - else if (_currentMode != InputMode.MODE_IME || !_currentMethod.wantHandleEvent(primaryCode)) + else if (_currentMode != InputMode.MODE_IME || (_currentMethod != null && !_currentMethod.wantHandleEvent(primaryCode))) { // If the IME does not want the event, we assume it's an plain-English keyboard. switch(primaryCode) { case Keyboard.KEYCODE_SHIFT: // Shift Key + if (_currentMode == InputMode.MODE_IME) + _currentMethod.commitCurrentComposingBuffer(); + Boolean isShifted = !_kbm.getCurrentKeyboard().isShifted(); _kbm.getCurrentKeyboard().setShifted(isShifted); KeyboardView kv = _kbm.getCurrentKeyboardView(); @@ -196,18 +199,28 @@ public class KerKerInputCore implements OnKeyboardActionListener { kv.onSizeChanged(kv.getWidth(), kv.getHeight(), 0, 0); break; case KBManager.KEYCODE_SYM: // 123 Keyboard + if (_currentMode == InputMode.MODE_IME) + _currentMethod.commitCurrentComposingBuffer(); + _currentMode = InputMode.MODE_SYM; _kbm.setNativeKeyboard(NativeKeyboardTypes.MODE_SYM); showIMENamePopup("123"); hideCandidatesView(); + break; case KBManager.KEYCODE_SYM_ALT: // 123 Keyboard + if (_currentMode == InputMode.MODE_IME) + _currentMethod.commitCurrentComposingBuffer(); + _currentMode = InputMode.MODE_SYM_ALT; _kbm.setNativeKeyboard(NativeKeyboardTypes.MODE_SYM_ALT); showIMENamePopup("#+="); hideCandidatesView(); break; case KBManager.KEYCODE_ABC: // ABC Keyboard + if (_currentMode == InputMode.MODE_IME) + _currentMethod.commitCurrentComposingBuffer(); + _currentMode = InputMode.MODE_ABC; _kbm.setNativeKeyboard(NativeKeyboardTypes.MODE_ABC); showIMENamePopup("ABC"); @@ -215,8 +228,10 @@ public class KerKerInputCore implements OnKeyboardActionListener { break; case KBManager.KEYCODE_IME: // IME Keyboard _currentMode = InputMode.MODE_IME; - _kbm.setNativeKeyboard(NativeKeyboardTypes.MODE_IME); + if (_currentMethod == null) + requestNextInputMethod(); _currentMethod.onEnterInputMethod(); + _kbm.setNativeKeyboard(NativeKeyboardTypes.MODE_IME); showIMENamePopup(_currentMethod.getName()); break; case Keyboard.KEYCODE_DELETE: @@ -231,7 +246,7 @@ public class KerKerInputCore implements OnKeyboardActionListener { } } else - _currentMethod.onKeyEvent(primaryCode, keyCodes); + if (_currentMethod != null) _currentMethod.onKeyEvent(primaryCode, keyCodes); } public void onText(CharSequence text) { @@ -263,7 +278,9 @@ public class KerKerInputCore implements OnKeyboardActionListener { } public void hideCandidatesView() { - //_frontEnd.setCandidatesViewShown(false); + if (_currentMode != InputMode.MODE_IME) + _frontEnd.setCandidatesViewShown(false); + if (_candidatesContainer != null) clearCandidates(); } @@ -291,7 +308,7 @@ public class KerKerInputCore implements OnKeyboardActionListener { showPopup(getFrontend().getResources().getString(resid)); } - public void showPopup(CharSequence msg) + public void showPopup(final CharSequence msg) { _txtvMsg.setText(msg); _txtvMsg.measure(MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED), MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED)); @@ -317,7 +334,8 @@ public class KerKerInputCore implements OnKeyboardActionListener { _handler.postDelayed(new Runnable() { public void run() { - hidePopup(); + if (_txtvMsg.getText() == msg.toString()) + hidePopup(); } }, 700); } @@ -332,4 +350,9 @@ public class KerKerInputCore implements OnKeyboardActionListener { {} } + public void commitText(CharSequence str) { + getConnection().commitText(str, 1); + hideCandidatesView(); + } + } src/idv/Zero/KerKerInput/KerKerInputCore.java @@ -3,10 +3,11 @@ package idv.Zero.KerKerInput; import android.app.AlertDialog; import android.content.DialogInterface; import android.content.Intent; -import android.inputmethodservice.*; +import android.inputmethodservice.InputMethodService; import android.net.Uri; import android.os.Handler; import android.view.*; +import android.view.inputmethod.EditorInfo; public class KerKerInputService extends InputMethodService { private String updateServiceURL = "http://zero.itszero.info/KerKerInput/version.dat"; @@ -33,6 +34,11 @@ public class KerKerInputService extends InputMethodService { return _core.requestInputView(); } + public void onStartInputView(EditorInfo info, boolean restarting) + { + _core.getKeyboardManager().setImeOptions(info.inputType); + } + @Override public View onCreateCandidatesView() { src/idv/Zero/KerKerInput/KerKerInputService.java @@ -2,11 +2,16 @@ package idv.Zero.KerKerInput; import android.app.Activity; import android.os.Bundle; +import android.widget.ListView; public class KerKerInputSettings extends Activity { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.settings); + // android.os.Debug.waitForDebugger(); + + ListView lstView = (ListView) findViewById(R.id.lstSettings); + lstView.setAdapter(new SettingsListAdapter(this)); } } src/idv/Zero/KerKerInput/KerKerInputSettings.java @@ -13,10 +13,10 @@ import android.content.Context; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteException; -import android.inputmethodservice.Keyboard; import android.util.Log; import android.view.KeyEvent; import idv.Zero.KerKerInput.KerKerInputCore; +import idv.Zero.KerKerInput.Keyboard; import idv.Zero.KerKerInput.R; import idv.Zero.KerKerInput.Methods.BPMFInputHelpers.ZhuYinComponentHelper; @@ -98,6 +98,10 @@ public class BPMFInput extends idv.Zero.KerKerInput.IKerKerInputMethod { return new Keyboard(_core.getFrontend(), R.xml.kb_zhuyin, R.id.mode_normal); } + public void commitCurrentComposingBuffer() { + commitText(getCompositeString()); + } + public boolean onKeyEvent(int keyCode, int[] keyCodes) { return handleBPMFKeyEvent(keyCode, keyCodes); } @@ -268,8 +272,7 @@ public class BPMFInput extends idv.Zero.KerKerInput.IKerKerInputMethod { private void commitText(CharSequence str) { - _core.getConnection().commitText(str, 1); - _core.hideCandidatesView(); + _core.commitText(str); inputBufferRaw = ""; updateCandidates(); currentState = InputState.STATE_INPUT; @@ -320,5 +323,4 @@ public class BPMFInput extends idv.Zero.KerKerInput.IKerKerInputMethod { K2N.put('y', "ㄗ"); K2N.put('z', "ㄈ"); } - } src/idv/Zero/KerKerInput/Methods/BPMFInput.java @@ -12,9 +12,9 @@ import android.content.Context; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteException; -import android.inputmethodservice.Keyboard; import android.view.KeyEvent; import idv.Zero.KerKerInput.KerKerInputCore; +import idv.Zero.KerKerInput.Keyboard; import idv.Zero.KerKerInput.R; public class NoSeeing extends idv.Zero.KerKerInput.IKerKerInputMethod { @@ -93,6 +93,10 @@ public class NoSeeing extends idv.Zero.KerKerInput.IKerKerInputMethod { public Keyboard getDesiredKeyboard() { return new Keyboard(_core.getFrontend(), R.xml.kb_noseeing, R.id.mode_normal); } + + public void commitCurrentComposingBuffer() { + commitText(getCompositeString()); + } public boolean onKeyEvent(int keyCode, int[] keyCodes) { return handleNoSeeingInput(keyCode, keyCodes); src/idv/Zero/KerKerInput/Methods/NoSeeing.java res/raw/noseeing.db f8ab0393c9dafdb9fbdada9ff76fca7af14b905f itsZero itszero@gmail.com http://github.com/itszero/KerKerInput/commit/90223f849190ddb6dc7a1e3e5a1f83c0e2f3fa4d 90223f849190ddb6dc7a1e3e5a1f83c0e2f3fa4d 2009-10-01T20:54:03-07:00 2009-10-01T20:54:03-07:00 Enhanced stability, settins is broken for now. Support ChangJei and NoSeeing (no worry, not going to provide noseeing db here...) 7f167106623dc40c8cd82f28f272290fd02163eb itsZero itszero@gmail.com