From 9725d3ae2b425d8a29bbbbe495590a120c94ff0b Mon Sep 17 00:00:00 2001 From: Hiromitsu Shioya Date: Fri, 29 Jan 2010 17:16:24 +0900 Subject: [PATCH] =?utf8?q?=E3=83=8B=E3=82=B3=EF=BC=92=E3=81=A7=E3=81=AE12?= =?utf8?q?=E3=83=A2=E3=83=BC=E3=83=89=E3=81=8C=E5=8B=95=E4=BD=9C=E3=81=97?= =?utf8?q?=E3=81=A6=E3=81=97=E3=81=BE=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F?= =?utf8?q?=E3=83=90=E3=82=B0=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- res/values-ja/string.xml | 2 +- res/values/strings.xml | 2 +- .../nicownn2/JAJP/DefaultSoftKeyboardNico2.java | 102 ++------------------- 3 files changed, 8 insertions(+), 98 deletions(-) diff --git a/res/values-ja/string.xml b/res/values-ja/string.xml index 4ef1ab4..cf3ed41 100644 --- a/res/values-ja/string.xml +++ b/res/values-ja/string.xml @@ -86,7 +86,7 @@ 英語変換時スペース チェックを外すと英語変換で「 」が挿入されなくなります 12キー表示 - チェックを入れるとニコめが表示されなくなります（上級者向け） + チェックを入れるとニコ目を非表示にします ※ニコ２では動作しません 変換表示スペース チェックを入れるとスペースが無くなります diff --git a/res/values/strings.xml b/res/values/strings.xml index a06a7d2..8f2f3a7 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -134,7 +134,7 @@ convert English uncheck, skip space. no screen 12key - check, no display second screen. + check, no display second screen.(not active nico2 mode) reload user symbols. check, reload user symbols table. diff --git a/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardNico2.java b/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardNico2.java index b81e14e..b85b3e2 100644 --- a/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardNico2.java +++ b/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardNico2.java @@ -106,25 +106,6 @@ public class DefaultSoftKeyboardNico2 extends DefaultSoftKeyboard { /** Previous input character code */ private int mPrevInputKeyCode = 0; - /** flick nicoinput **/ - private static final int NICOFLICK_NONE = 0; - private static final int NICOFLICK_1STROKE = 1; - private static final int NICOFLICK_NICOSTROKE = 2; - - private int mFlickNicoInput = 0; - private boolean mNicoFlick = false; - private static final HashMap flickModeTable = new HashMap() { - /** - * - */ - private static final long serialVersionUID = 1L; - - { - put("none_flick", 0); - put("normal_stroke", 1); - put("nico_stroke", 2); - }}; - private static final NicoWnnEvent mEventTouchOtherKey = new NicoWnnEvent(NicoWnnEvent.TOUCH_OTHER_KEY); private static final NicoWnnEvent mEventCommitText = new NicoWnnEvent(NicoWnnEvent.COMMIT_COMPOSING_TEXT); private static final NicoWnnEvent mEventConvert = new NicoWnnEvent(NicoWnnEvent.CONVERT); @@ -178,9 +159,6 @@ public class DefaultSoftKeyboardNico2 extends DefaultSoftKeyboard { private Keyboard[][] mNicoKeyboard; - private boolean mGetNoFlipScreen = false; - private boolean mNoFlipScreen = false; - /** option keyboard type */ private int mHookStockKeyType; @@ -217,8 +195,6 @@ public class DefaultSoftKeyboardNico2 extends DefaultSoftKeyboard { SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(parent); mChange12keyQwertyMode = pref.getBoolean("change_12key_qwerty", false); boolean getalphamode = pref.getBoolean("change_alphamode", false); - mGetNoFlipScreen = pref.getBoolean("no_flip_screen", false); - mFlickNicoInput = flickModeTable.get(pref.getString("nicoflick_mode", "none_flick")); if (false == getalphamode) { mChangeAlphaBigMode = ALPHAMODE_SMALL; @@ -226,13 +202,6 @@ public class DefaultSoftKeyboardNico2 extends DefaultSoftKeyboard { else{ mChangeAlphaBigMode = ALPHAMODE_BIG; } - - if (true == mGetNoFlipScreen) { - mNoFlipScreen = true; - } - else{ - mNoFlipScreen = false; - } /* Create the suitable keyboard object */ if (mDisplayMode == DefaultSoftKeyboard.PORTRAIT) { @@ -291,7 +260,6 @@ public class DefaultSoftKeyboardNico2 extends DefaultSoftKeyboard { mInputType = INPUT_TYPE_TOGGLE; mode = NicoWnnEvent.Mode.DEFAULT; mNicoFirst = false; - mNicoFlick = false; break; default: @@ -430,8 +398,6 @@ public class DefaultSoftKeyboardNico2 extends DefaultSoftKeyboard { mChange12keyQwertyMode = pref.getBoolean("change_12key_qwerty", false); boolean getalphamode = pref.getBoolean("change_alphamode", false); - mGetNoFlipScreen = pref.getBoolean("no_flip_screen", false); - mFlickNicoInput = flickModeTable.get(pref.getString("nicoflick_mode", "none_flick")); if (false == getalphamode) { mChangeAlphaBigMode = ALPHAMODE_SMALL; @@ -439,13 +405,6 @@ public class DefaultSoftKeyboardNico2 extends DefaultSoftKeyboard { else{ mChangeAlphaBigMode = ALPHAMODE_BIG; } - - if (true == mGetNoFlipScreen) { - mNoFlipScreen = true; - } - else{ - mNoFlipScreen = false; - } if (old12keyqwerty != mChange12keyQwertyMode) { restartkey = true; @@ -819,13 +778,6 @@ public class DefaultSoftKeyboardNico2 extends DefaultSoftKeyboard { case KEYCODE_NEWKEY_2: case KEYCODE_NEWKEY_3: case KEYCODE_NEWKEY_4: - if ((NICOFLICK_1STROKE == mFlickNicoInput) && (false == mNicoFirst)) { - break; - } - if ((NICOFLICK_NICOSTROKE == mFlickNicoInput) && (true == mNicoFlick) && (mPrevInputKeyCode == primaryCode)) { - mNicoFlick = false; - break; - } if (mNicoFirst == false) { mWnn.onEvent(mEventTouchOtherKey); mPrevInputKeyCode = primaryCode; @@ -836,26 +788,21 @@ public class DefaultSoftKeyboardNico2 extends DefaultSoftKeyboard { Keyboard[][] keyList = mKeyboard[LANG_JA][mDisplayMode][KEYBOARD_12KEY][KEYBOARD_SHIFT_ON]; keyList[KEYMODE_JA_FULL_NICO] = mNicoKeyboard[index+1]; - if (false == mNoFlipScreen) { - newKeyboard = getShiftChangeKeyboard(KEYBOARD_SHIFT_ON); - mShiftOn = KEYBOARD_SHIFT_ON; - changeKeyboard(newKeyboard); - } + newKeyboard = getShiftChangeKeyboard(KEYBOARD_SHIFT_ON); + mShiftOn = KEYBOARD_SHIFT_ON; + changeKeyboard(newKeyboard); } else{ /* change keyboard */ - if (false == mNoFlipScreen) { - newKeyboard = getShiftChangeKeyboard(KEYBOARD_SHIFT_OFF); - mShiftOn = KEYBOARD_SHIFT_OFF; - changeKeyboard(newKeyboard); - } + newKeyboard = getShiftChangeKeyboard(KEYBOARD_SHIFT_OFF); + mShiftOn = KEYBOARD_SHIFT_OFF; + changeKeyboard(newKeyboard); /* set input char & update text */ int col = getTableIndex(mPrevInputKeyCode); int row = getTableIndex(primaryCode); String[][] cycleTable = getCycleTable(); mWnn.onEvent(new NicoWnnEvent(NicoWnnEvent.TOGGLE_CHAR, cycleTable[col * 15 + row])); mNicoFirst = false; - mNicoFlick = false; } break; @@ -939,49 +886,12 @@ public class DefaultSoftKeyboardNico2 extends DefaultSoftKeyboard { changeKeyboard(newKeyboard); } mNicoFirst = false; - mNicoFlick = false; } // resetNicoKeyboard /** */ @Override public void onPress(int primaryCode) { super.onPress(primaryCode); - mStockFlickCode = primaryCode; - if (mCurrentKeyMode == KEYMODE_JA_FULL_NICO) { - if (NICOFLICK_NONE == mFlickNicoInput) { - return; - } - switch (primaryCode) { - case KEYCODE_JP12_1: - case KEYCODE_JP12_2: - case KEYCODE_JP12_3: - case KEYCODE_JP12_4: - case KEYCODE_JP12_5: - case KEYCODE_JP12_6: - case KEYCODE_JP12_7: - case KEYCODE_JP12_8: - case KEYCODE_JP12_9: - case KEYCODE_JP12_0: - if ((false == mNicoFirst) && (false == mNicoFlick)) { - mWnn.onEvent(mEventTouchOtherKey); - if (false == mNoFlipScreen) { - int index = getTableIndex(primaryCode); - Keyboard[][] keyList = mKeyboard[LANG_JA][mDisplayMode][KEYBOARD_12KEY][KEYBOARD_SHIFT_ON]; - keyList[KEYMODE_JA_FULL_NICO] = mNicoKeyboard[index+1]; - Keyboard newKeyboard = getShiftChangeKeyboard(KEYBOARD_SHIFT_ON); - mShiftOn = KEYBOARD_SHIFT_ON; - changeKeyboard(newKeyboard); - } - mPrevInputKeyCode = primaryCode; - mNicoFirst = true; - mNicoFlick = true; - } - else if ((true == mNicoFirst) && (true == mNicoFlick)) { - mNicoFlick = false; // Take measures Ver.2.0. - } - break; - } - } } /** */ -- 2.11.0