1.0.16:

英文字打鍵時に大文字か小文字かの選択を追加
"(",")"の大小での文字変化を増やした
”絵”を押した際に全画面で開くようにした
”記号”での絵文字リストを削除

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4c7d912..f9901a8 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,7 +16,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
          package="com.hiroshica.android.input.nicownn2"
-         android:versionCode="15" android:versionName="1.0.15">
+         android:versionCode="16" android:versionName="1.0.16">
   <uses-permission xmlns:android="http://schemas.android.com/apk/res/android" android:name="android.permission.VIBRATE"/>
     <application android:icon="@drawable/icon" android:label="NicoWnn">
 

diff --git a/res/values-ja/string.xml b/res/values-ja/string.xml
index dc1277f..0117684 100644 (file)
--- a/res/values-ja/string.xml
+++ b/res/values-ja/string.xml
@@ -79,6 +79,8 @@
     <string name="preference_nicownn_change_12key_summary_ja">チェックを入れると英数字がQWERTYになります</string>
     <string name="preference_nicownn_change_bellmode">キー配置</string>
     <string name="preference_nicownn_change_bellmode_summary_ja">チェックを入れるとベル打ちになります</string>
+    <string name="preference_nicownn_change_alphamode">ニコ/ベル打ちでの英字の扱い</string>
+    <string name="preference_nicownn_change_alphamode_summary_ja">チェックを入れると英字入力が大文字になります</string>
     <string name="preference_nicownn_change_y_bellmode">や行の扱い</string>
     <string name="preference_nicownn_change_y_bellmode_summary_ja">チェックを入れるとや行がベル打ちになります</string>
     <string name="preference_nicownn_is_skip_space">英語変換時スペース</string>
@@ -130,13 +132,13 @@
 
   <!-- IME dependency -->
     <!-- OpenWnn English -->
-    <string name="nicownn_english_copyright">OpenWnn Ver.1.3.1/NicoWnn Ver.1.0.15\nオムロン ソフトウェア(株)/hiroshica</string>
+    <string name="nicownn_english_copyright">OpenWnn Ver.1.3.1/NicoWnn Ver.1.0.16\nオムロン ソフトウェア(株)/hiroshica</string>
 
     <!-- OpenWnn Japanese -->
-    <string name="nicownn_japanese_copyright">OpenWnn Ver.1.3.1/NicoWnn Ver.1.0.15\nオムロン ソフトウェア(株)/hiroshica</string>
+    <string name="nicownn_japanese_copyright">OpenWnn Ver.1.3.1/NicoWnn Ver.1.0.16\nオムロン ソフトウェア(株)/hiroshica</string>
 
     <!-- OpenWnn Chinese -->
-    <string name="nicownn_china_copyright">OpenWnn Ver.1.3.1/NicoWnn Ver.1.0.15\nオムロン ソフトウェア(株)/hiroshica</string>
+    <string name="nicownn_china_copyright">OpenWnn Ver.1.3.1/NicoWnn Ver.1.0.16\nオムロン ソフトウェア(株)/hiroshica</string>
 
   <!-- Candidate Delete -->
       <string name="button_candidate_select">選　択</string>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index e4c5eb0..b135a88 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -122,10 +122,12 @@
   <string name="preference_nicownn_menu"> nicoWnn option </string>
   <string name="preference_nicownn_change_keitaimode">on/off keitai mode</string>
   <string name="preference_nicownn_change_keitaimode_ja">on/off keitai mode.</string>
-  <string name="preference_nicownn_change_12key_qwerty">alpha/num mode</string>
+  <string name="preference_nicownn_change_12key_qwerty">alphabet/num mode</string>
   <string name="preference_nicownn_change_12key_summary_ja">change alphabet/number mode.</string>
   <string name="preference_nicownn_change_bellmode">Bell mode</string>
   <string name="preference_nicownn_change_bellmode_summary_ja">change Nico/Bell touch</string>
+  <string name="preference_nicownn_change_alphamode">nico/bell alphabet mode</string>
+  <string name="preference_nicownn_change_alphamode_summary_ja">check, Capitalize Alphabet.</string>
   <string name="preference_nicownn_change_y_bellmode">Ya-Line mode</string>
   <string name="preference_nicownn_change_y_bellmode_summary_ja">change Ya-Line Nico/Bell touch</string>
   <string name="preference_nicownn_is_skip_space">convert English</string>
@@ -140,20 +142,20 @@
 
   <!-- IME dependency -->
   <!-- OpenWnn English -->
-  <string name="nicownn_english_copyright">Ver.1.3.1\nOMRON SOFTWARE Co., Ltd.\nNicoWnn Ver.1.0.15</string>
+  <string name="nicownn_english_copyright">Ver.1.3.1\nOMRON SOFTWARE Co., Ltd.\nNicoWnn Ver.1.0.16</string>
   <string name="nicownn_english">nicoWnn English</string>
   <string name="nicownn_english_system_dictionary">/data/data/com.hiroshica.android.input.nicownn2/lib/libWnnEngDic.so</string>
   <string name="nicownn_english_writable_dictionary">/data/data/com.hiroshica.android.input.nicownn2/writableEN.dic</string>
   <string name="en_word_separators">.,;:!?</string>
 
   <!-- OpenWnn Japanese -->
-  <string name="nicownn_japanese_copyright">Ver.1.3.1\nOMRON SOFTWARE Co., Ltd.\nNicoWnn Ver.1.0.15</string>
+  <string name="nicownn_japanese_copyright">Ver.1.3.1\nOMRON SOFTWARE Co., Ltd.\nNicoWnn Ver.1.0.16</string>
   <string name="nicownn_japanese">nicoWnn IME</string>
   <string name="openwnn_japanese_system_dictionary">/data/data/com.hiroshica.android.input.nicownn2/lib/libWnnJpnDic.so</string>
   <string name="nicownn_japanese_writable_dictionary">/data/data/com.hiroshica.android.input.nicownn2/writableJAJP.dic</string>
 
   <!-- OpenWnn Chinese -->
-  <string name="nicownn_china_copyright">Ver.1.3.1\nOMRON SOFTWARE Co., Ltd.\nNicoWnn Ver.1.0.15</string>
+  <string name="nicownn_china_copyright">Ver.1.3.1\nOMRON SOFTWARE Co., Ltd.\nNicoWnn Ver.1.0.16</string>
   <string name="nicownn_china">nicoWnn Chinese</string>
   <string name="openwnn_china_system_dictionary">/data/data/com.hiroshica.android.input.nicownn2/lib/libWnnZHCNDic.so</string>
   <!-- After Config Change -->

diff --git a/res/xml/nicownn_pref_ja.xml b/res/xml/nicownn_pref_ja.xml
index 99d3aaa..2a32e8e 100644 (file)
--- a/res/xml/nicownn_pref_ja.xml
+++ b/res/xml/nicownn_pref_ja.xml
@@ -35,6 +35,10 @@
                          android:title="@string/preference_nicownn_change_y_bellmode"
                          android:summary="@string/preference_nicownn_change_y_bellmode_summary_ja"
                          android:defaultValue="false" />
+      <CheckBoxPreference android:key="change_alphamode"
+                         android:title="@string/preference_nicownn_change_alphamode"
+                         android:summary="@string/preference_nicownn_change_alphamode_summary_ja"
+                         android:defaultValue="false" />
       <CheckBoxPreference android:key="is_skip_space"
                          android:title="@string/preference_nicownn_is_skip_space"
                          android:summary="@string/preference_nicownn_is_skip_space_summary_ja"

diff --git a/src/com/hiroshica/android/input/nicownn2/CandidatesViewManager.java b/src/com/hiroshica/android/input/nicownn2/CandidatesViewManager.java
index 3dc9138..97b9278 100644 (file)
--- a/src/com/hiroshica/android/input/nicownn2/CandidatesViewManager.java
+++ b/src/com/hiroshica/android/input/nicownn2/CandidatesViewManager.java
@@ -92,7 +92,7 @@ public interface CandidatesViewManager {
      *
      * @see com.hiroshica.android.input.nicownn2.WnnEngine#getNextCandidate
      */
-    public void displayCandidates(WnnEngine converter);
+    public void displayCandidates(WnnEngine converter, boolean isfull);
 
     /**
      * Clear and hide the candidates view.

diff --git a/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardJAJP.java b/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardJAJP.java
index ee3f663..128b9c5 100644 (file)
--- a/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardJAJP.java
+++ b/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardJAJP.java
@@ -301,6 +301,33 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard {
        };
        /** Toggle cycle table for full-width belltouch */
        private static final String[][] JP_FULL_BELL_CYCLE_TABLE = {
+               {"\u3042"}, {"\u3044"}, {"\u3046"}, {"\u3048"}, {"\u304a"},      {"a"},      {"b"},      {"c"},      {"d"}, {"e"},
+               {"\u304b"}, {"\u304d"}, {"\u304f"}, {"\u3051"}, {"\u3053"},      {"f"},      {"g"},      {"h"},      {"i"}, {"j"},
+               {"\u3055"}, {"\u3057"}, {"\u3059"}, {"\u305b"}, {"\u305d"},      {"k"},      {"l"},      {"m"},      {"n"}, {"o"},
+               {"\u305f"}, {"\u3061"}, {"\u3064"}, {"\u3066"}, {"\u3068"},      {"p"},      {"q"},      {"r"},      {"s"}, {"t"},
+               {"\u306a"}, {"\u306b"}, {"\u306c"}, {"\u306d"}, {"\u306e"},      {"u"},      {"v"},      {"w"},      {"x"}, {"y"},
+               {"\u306f"}, {"\u3072"}, {"\u3075"}, {"\u3078"}, {"\u307b"},      {"z"},      {" "},      {" "},      {" "}, {" "},
+               {"\u307e"}, {"\u307f"}, {"\u3080"}, {"\u3081"}, {"\u3082"},      {" "},      {" "},      {" "},      {" "}, {" "},
+               {"\u3084"},      {" "}, {"\u3086"},      {" "}, {"\u3088"}, {"\u30fc"}, {"\u30fb"}, {"\uff01"}, {"\uff1f"}, {" "},
+               {"\u3089"}, {"\u308a"}, {"\u308b"}, {"\u308c"}, {"\u308d"},      {"1"},      {"2"},      {"3"},      {"4"}, {"5"},
+               {"\u308f"}, {"\u3092"}, {"\u3093"}, {"\u3001"}, {"\u3002"},      {"6"},      {"7"},      {"8"},      {"9"}, {"0"},
+       };
+
+       /** Toggle cycle table for full-width Nikotouch */
+       private static final String[][] JP_FULL_NIKO_CYCLE_TABLE_BIG = {
+               {"\u3042"}, {"\u3044"}, {"\u3046"}, {"\u3048"}, {"\u304a"},      {"."},      {"-"},      {"@"},      {"_"}, {"1"},
+               {"\u304b"}, {"\u304d"}, {"\u304f"}, {"\u3051"}, {"\u3053"},      {" "},      {"A"},      {"B"},      {"C"}, {"2"},
+               {"\u3055"}, {"\u3057"}, {"\u3059"}, {"\u305b"}, {"\u305d"},      {"/"},      {"D"},      {"E"},      {"F"}, {"3"},
+               {"\u305f"}, {"\u3061"}, {"\u3064"}, {"\u3066"}, {"\u3068"}, {"\u3063"},      {"G"},      {"H"},      {"I"}, {"4"},
+               {"\u306a"}, {"\u306b"}, {"\u306c"}, {"\u306d"}, {"\u306e"},      {"("},      {"J"},      {"K"},      {"L"}, {"5"},
+               {"\u306f"}, {"\u3072"}, {"\u3075"}, {"\u3078"}, {"\u307b"},      {")"},      {"M"},      {"N"},      {"O"}, {"6"},
+               {"\u307e"}, {"\u307f"}, {"\u3080"}, {"\u3081"}, {"\u3082"},      {"P"},      {"Q"},      {"R"},      {"S"}, {"7"},
+               {"\u3084"}, {"\u3086"}, {"\u3088"}, {"\u3083"}, {"\u3085"}, {"\u3087"},      {"T"},      {"U"},      {"V"}, {"8"},
+               {"\u3089"}, {"\u308a"}, {"\u308b"}, {"\u308c"}, {"\u308d"},      {"W"},      {"X"},      {"Y"},      {"Z"}, {"9"},
+               {"\u308f"}, {"\u3092"}, {"\u3093"}, {"\u3001"}, {"\u3002"}, {"\u30fc"}, {"\u30fb"}, {"\uff01"}, {"\uff1f"}, {"0"},
+       };
+       /** Toggle cycle table for full-width belltouch */
+       private static final String[][] JP_FULL_BELL_CYCLE_TABLE_BIG = {
                {"\u3042"}, {"\u3044"}, {"\u3046"}, {"\u3048"}, {"\u304a"},      {"A"},      {"B"},      {"C"},      {"D"}, {"E"},
                {"\u304b"}, {"\u304d"}, {"\u304f"}, {"\u3051"}, {"\u3053"},      {"F"},      {"G"},      {"H"},      {"I"}, {"J"},
                {"\u3055"}, {"\u3057"}, {"\u3059"}, {"\u305b"}, {"\u305d"},      {"K"},      {"L"},      {"M"},      {"N"}, {"O"},
@@ -354,8 +381,8 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard {
 
                        put("\u3000", " "); put(" ", "\u3000");
 
-                       put("(", "["); put("[", "(");
-                       put(")", "]"); put("]", ")");
+                       put("(", "["); put("[", "\u300c"); put("\u300c", "\u300e"); put("\u300e", "\u3010"); put("\u3010", "(");
+                       put(")", "]"); put("]", "\u300d"); put("\u300d", "\u300f"); put("\u300f", "\u3011"); put("\u3011", ")");
                }};
        
 
@@ -449,6 +476,7 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard {
        /** option bell type **/
        private boolean mChangeYLineBellMode = false;
        private boolean mChangeBellMode = false;
+       private boolean mChangeAlphaBigMode = false;
 
        /** Default constructor */
        public DefaultSoftKeyboardJAJP() {
@@ -470,6 +498,7 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard {
                mChange12keyQwertyMode = pref.getBoolean("change_12key_qwerty", false);
                mChangeYLineBellMode   = pref.getBoolean("change_y_bellmode", false);
                mChangeBellMode        = pref.getBoolean("change_bellmode", false);
+               mChangeAlphaBigMode    = pref.getBoolean("change_alphamode", false);
                mFlickNicoInput        = flickModeTable.get(pref.getString("nicoflick_mode", "none_flick"));
                
                /* Create the suitable keyboard object */
@@ -725,6 +754,7 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard {
                mChange12keyQwertyMode = pref.getBoolean("change_12key_qwerty", false);
                mChangeYLineBellMode   = pref.getBoolean("change_y_bellmode", false);
                mChangeBellMode        = pref.getBoolean("change_bellmode", false);
+               mChangeAlphaBigMode    = pref.getBoolean("change_alphamode", false);
                mFlickNicoInput        = flickModeTable.get(pref.getString("nicoflick_mode", "none_flick"));
                if (old12keyqwerty != mChange12keyQwertyMode) {
                        restartkey = true;
@@ -1166,10 +1196,20 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard {
 
                case KEYMODE_JA_FULL_NIKO:
                        if (false == mChangeBellMode) {
-                               cycleTable = JP_FULL_NIKO_CYCLE_TABLE;
+                               if (false == mChangeAlphaBigMode) {
+                                       cycleTable = JP_FULL_NIKO_CYCLE_TABLE;
+                               }
+                               else{
+                                       cycleTable = JP_FULL_NIKO_CYCLE_TABLE_BIG;
+                               }
                        }
                        else{
-                               cycleTable = JP_FULL_BELL_CYCLE_TABLE;
+                               if (false == mChangeAlphaBigMode) {
+                                       cycleTable = JP_FULL_BELL_CYCLE_TABLE;
+                               }
+                               else{
+                                       cycleTable = JP_FULL_BELL_CYCLE_TABLE_BIG;
+                               }
                        }
                        break;
 

diff --git a/src/com/hiroshica/android/input/nicownn2/NicoWnnEN.java b/src/com/hiroshica/android/input/nicownn2/NicoWnnEN.java
index 3be9f5c..ffb08e9 100644 (file)
--- a/src/com/hiroshica/android/input/nicownn2/NicoWnnEN.java
+++ b/src/com/hiroshica/android/input/nicownn2/NicoWnnEN.java
@@ -765,7 +765,7 @@ public class NicoWnnEN extends NicoWnn {
         }
         /* update the candidates view */
         if (candidates > 0) {
-            mCandidatesViewManager.displayCandidates(mConverter);
+            mCandidatesViewManager.displayCandidates(mConverter, false);
         } else {
             mCandidatesViewManager.clearCandidates();
         }

diff --git a/src/com/hiroshica/android/input/nicownn2/NicoWnnJAJP.java b/src/com/hiroshica/android/input/nicownn2/NicoWnnJAJP.java
index c085f49..f93dfe3 100644 (file)
--- a/src/com/hiroshica/android/input/nicownn2/NicoWnnJAJP.java
+++ b/src/com/hiroshica/android/input/nicownn2/NicoWnnJAJP.java
@@ -245,7 +245,10 @@ public class NicoWnnJAJP extends NicoWnn {
                 * @return {@code true} if the mode is "symbol list".
                 */
                public boolean isSymbolList() {
-                       return temporaryMode == TEMPORARY_DICTIONARY_MODE_SYMBOL;
+                       return ((temporaryMode == TEMPORARY_DICTIONARY_MODE_SYMBOL) || (temporaryMode == TEMPORARY_DICTIONARY_MODE_DOCOMOSYMBOL));
+               }
+               public boolean isDocomoSymbolList() {
+                       return temporaryMode == TEMPORARY_DICTIONARY_MODE_DOCOMOSYMBOL;
                }
 
                /**
@@ -287,7 +290,8 @@ public class NicoWnnJAJP extends NicoWnn {
 
        /** Symbol lists to display when the symbol key is pressed */
        private static final String[] SYMBOL_LISTS = {
-               SymbolList.SYMBOL_DOCOMO_EMOJI, SymbolList.SYMBOL_JAPANESE, SymbolList.SYMBOL_ENGLISH, SymbolList.SYMBOL_JAPANESE_FACE
+               //SymbolList.SYMBOL_DOCOMO_EMOJI, SymbolList.SYMBOL_JAPANESE, SymbolList.SYMBOL_ENGLISH, SymbolList.SYMBOL_JAPANESE_FACE
+               SymbolList.SYMBOL_JAPANESE, SymbolList.SYMBOL_ENGLISH, SymbolList.SYMBOL_JAPANESE_FACE
        };
 
        /** Current symbol list */
@@ -1279,7 +1283,7 @@ public class NicoWnnJAJP extends NicoWnn {
                if (candidates > 0) {
                        mHasContinuedPrediction = ((mComposingText.size(ComposingText.LAYER1) == 0)
                                                   && !mEngineState.isSymbolList());
-                       mCandidatesViewManager.displayCandidates(mConverter);
+                       mCandidatesViewManager.displayCandidates(mConverter, mEngineState.isDocomoSymbolList());
                } else {
                        mCandidatesViewManager.clearCandidates();
                }
@@ -1521,7 +1525,7 @@ public class NicoWnnJAJP extends NicoWnn {
 
                        if (candidates != 0) {
                                mComposingText.setCursor(ComposingText.LAYER2, 1);
-                               mCandidatesViewManager.displayCandidates(mConverter);
+                               mCandidatesViewManager.displayCandidates(mConverter, false);
                        } else {
                                mComposingText.setCursor(ComposingText.LAYER1,
                                                         mComposingText.toString(ComposingText.LAYER1).length());

diff --git a/src/com/hiroshica/android/input/nicownn2/SymbolList.java b/src/com/hiroshica/android/input/nicownn2/SymbolList.java
index 1711090..e76972c 100644 (file)
--- a/src/com/hiroshica/android/input/nicownn2/SymbolList.java
+++ b/src/com/hiroshica/android/input/nicownn2/SymbolList.java
@@ -180,6 +180,16 @@ public class SymbolList implements WnnEngine {
         mCurrentList = mSymbols.get(listType);
         return (mCurrentList != null);
     }
+    public boolean checkDictionary(String listType) {
+               if (null == mCurrentList) {
+                       return false;
+               }
+        if (mCurrentList != mSymbols.get(listType)) {
+                       return false;
+               }
+               return true;
+    }
+
 
     /***********************************************************************
      * WnnEngine's interface

diff --git a/src/com/hiroshica/android/input/nicownn2/TextCandidatesViewManager.java b/src/com/hiroshica/android/input/nicownn2/TextCandidatesViewManager.java
index 850d237..1f39161 100644 (file)
--- a/src/com/hiroshica/android/input/nicownn2/TextCandidatesViewManager.java
+++ b/src/com/hiroshica/android/input/nicownn2/TextCandidatesViewManager.java
@@ -474,6 +474,7 @@ public class TextCandidatesViewManager implements CandidatesViewManager, Gesture
                     setReadMore();
                 }
             } else {
+                               mIsFullView = true;
                 if (mViewBody.isShown()) {
                     mWnn.setCandidatesViewShown(false);
                 }
@@ -519,7 +520,7 @@ public class TextCandidatesViewManager implements CandidatesViewManager, Gesture
     }
 
     /** @see CandidatesViewManager#displayCandidates */
-    public void displayCandidates(WnnEngine converter) {
+    public void displayCandidates(WnnEngine converter, boolean isfull) {
 
         mCanReadMore = false;
         mDisplayEndOffset = 0;
@@ -532,12 +533,15 @@ public class TextCandidatesViewManager implements CandidatesViewManager, Gesture
 
         clearCandidates();
         mConverter = converter;
-        setViewLayout(CandidatesViewManager.VIEW_TYPE_NORMAL);
-        
+               setViewLayout(CandidatesViewManager.VIEW_TYPE_NORMAL);
         mViewCandidateTemplate.setVisibility(View.VISIBLE);
         mViewCandidateTemplate.setBackgroundResource(R.drawable.cand_back);
 
         displayCandidates(converter, true, getMaxLine());
+               if (true == isfull) {
+                       mIsFullView = true;
+                       mWnn.onEvent(new NicoWnnEvent(NicoWnnEvent.LIST_CANDIDATES_FULL));
+               }
     }
 
     /** @see CandidatesViewManager#getMaxLine */