Add CJ Big5 database download

lime-ime · Mar 4, 2016 · 504d94c · 504d94c
1 parent 7a9651e
commit 504d94c
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 6 deletions.
diff --git a/Database/cjbig5.db b/Database/cjbig5.db
diff --git a/Database/cjbig5.zip b/Database/cjbig5.zip
diff --git a/LimeStudio/app/src/main/java/net/toload/main/hd/Lime.java b/LimeStudio/app/src/main/java/net/toload/main/hd/Lime.java
@@ -116,6 +116,9 @@ public class Lime {
     public static final String DATABASE_OPENFOUNDRY_IM_CJ5 = DATABASE_OPENFOUNDRY_URL_BASED + "cj5.zip";
     public static final String DATABASE_CLOUD_IM_CJ5_KEYBOARD = "cj";
 
+    public static final String DATABASE_CLOUD_IM_CJ_BIG5 = DATABASE_CLOUD_URL_BASED + "cjbig5.zip";
+    public static final String DATABASE_OPENFOUNDRY_IM_CJ_BIG5 = DATABASE_OPENFOUNDRY_URL_BASED + "cjbig5.zip";
+
     public static final String DATABASE_CLOUD_IM_CJ = DATABASE_CLOUD_URL_BASED + "cj.zip";
     public static final String DATABASE_OPENFOUNDRY_IM_CJ = DATABASE_OPENFOUNDRY_URL_BASED + "cj.zip";
     public static final String DATABASE_CLOUD_IM_CJ_KEYBOARD = "cj";
@@ -166,6 +169,7 @@ public class Lime {
 
     public static final String IM_ARRAY = "array";
     public static final String IM_ARRAY10 = "array10";
+    public static final String IM_CJ_BIG5 = "cjbig5";
     public static final String IM_CJ = "cj";
     public static final String IM_CJHK = "cjhk";
     public static final String IM_CJ5 = "cj5";

diff --git a/LimeStudio/app/src/main/java/net/toload/main/hd/ui/SetupImLoadDialog.java b/LimeStudio/app/src/main/java/net/toload/main/hd/ui/SetupImLoadDialog.java
@@ -306,7 +306,7 @@ public void onClick(View v) {
 
                 if (imtype.equals(Lime.DB_TABLE_PHONETIC)) {
 
-                    btnSetupImDialogLoad1.setText(getResources().getString(R.string.l3_im_download_from_phonetic_big5) + " (34,838)");
+                    btnSetupImDialogLoad1.setText(getResources().getString(R.string.l3_im_download_from_phonetic_big5) + " (15,945)");
                     btnSetupImDialogLoad1.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View v) {
@@ -320,7 +320,7 @@ public void onClick(View v) {
                             downloadAndLoadIm(Lime.DB_TABLE_PHONETIC, Lime.IM_PHONETIC_ADV);
                         }
                     });
-                    btnSetupImDialogLoad3.setText(getResources().getString(R.string.l3_im_download_from_phonetic_adv_big5) + " (95,029)");
+                    btnSetupImDialogLoad3.setText(getResources().getString(R.string.l3_im_download_from_phonetic_adv_big5) + " (76,122)");
                     btnSetupImDialogLoad3.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View v) {
@@ -337,21 +337,27 @@ public void onClick(View v) {
 
                 } else if (imtype.equals(Lime.DB_TABLE_CJ)) {
 
-                    btnSetupImDialogLoad1.setText(getResources().getString(R.string.l3_im_download_from_cj) + " (28,596)");
+                    btnSetupImDialogLoad1.setText(getResources().getString(R.string.l3_im_download_from_cj_big5) + " (13,859)");
                     btnSetupImDialogLoad1.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View v) {
-                            downloadAndLoadIm(Lime.DB_TABLE_CJ, Lime.IM_CJ);
+                            downloadAndLoadIm(Lime.DB_TABLE_CJ, Lime.IM_CJ_BIG5);
                         }
                     });
-                    btnSetupImDialogLoad2.setText(getResources().getString(R.string.l3_im_download_from_cjk_hk_cj) + " (30,278)");
+                    btnSetupImDialogLoad2.setText(getResources().getString(R.string.l3_im_download_from_cj) + " (28,596)");
                     btnSetupImDialogLoad2.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            downloadAndLoadIm(Lime.DB_TABLE_CJ, Lime.IM_CJ);
+                        }
+                    });
+                    btnSetupImDialogLoad3.setText(getResources().getString(R.string.l3_im_download_from_cjk_hk_cj) + " (30,278)");
+                    btnSetupImDialogLoad3.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View v) {
                             downloadAndLoadIm(Lime.DB_TABLE_CJ, Lime.IM_CJHK);
                         }
                     });
-                    btnSetupImDialogLoad3.setVisibility(View.GONE);
                     btnSetupImDialogLoad4.setVisibility(View.GONE);
 
                 } else if (imtype.equals(Lime.DB_TABLE_CJ5)) {
@@ -658,6 +664,8 @@ public void downloadAndLoadIm(String code, String type){
                 url = Lime.DATABASE_CLOUD_IM_ARRAY;
             }else if(type.equals(Lime.IM_ARRAY10 )){
                 url = Lime.DATABASE_CLOUD_IM_ARRAY10;
+            }else if(type.equals(Lime.IM_CJ_BIG5 )){
+                url = Lime.DATABASE_CLOUD_IM_CJ_BIG5;
             }else if(type.equals(Lime.IM_CJ )){
                 url = Lime.DATABASE_CLOUD_IM_CJ;
             }else if(type.equals(Lime.IM_CJHK )){

diff --git a/LimeStudio/app/src/main/java/net/toload/main/hd/ui/SetupImLoadRunnable.java b/LimeStudio/app/src/main/java/net/toload/main/hd/ui/SetupImLoadRunnable.java
@@ -105,6 +105,8 @@ public void run() {
                 url = Lime.DATABASE_OPENFOUNDRY_IM_ARRAY;
             }else if(type.equals(Lime.IM_ARRAY10 )){
                 url = Lime.DATABASE_OPENFOUNDRY_IM_ARRAY10;
+            }else if(type.equals(Lime.IM_CJ_BIG5 )){
+                url = Lime.DATABASE_OPENFOUNDRY_IM_CJ_BIG5;
             }else if(type.equals(Lime.IM_CJ )){
                 url = Lime.DATABASE_OPENFOUNDRY_IM_CJ;
             }else if(type.equals(Lime.IM_CJHK )){
@@ -123,6 +125,10 @@ public void run() {
                 url = Lime.DATABASE_OPENFOUNDRY_IM_ECJHK;
             }else if(type.equals(Lime.IM_EZ )){
                 url = Lime.DATABASE_OPENFOUNDRY_IM_EZ;
+            }else if(type.equals(Lime.IM_PHONETIC_BIG5 )){
+                url = Lime.DATABASE_OPENFOUNDRY_IM_PHONETIC_BIG5;
+            }else if(type.equals(Lime.IM_PHONETIC_ADV_BIG5 )){
+                url = Lime.DATABASE_OPENFOUNDRY_IM_PHONETICCOMPLETE_BIG5;
             }else if(type.equals(Lime.IM_PHONETIC )){
                 url = Lime.DATABASE_OPENFOUNDRY_IM_PHONETIC;
             }else if(type.equals(Lime.IM_PHONETIC_ADV )){

diff --git a/LimeStudio/app/src/main/res/values-zh-rCN/strings.xml b/LimeStudio/app/src/main/res/values-zh-rCN/strings.xml
@@ -244,6 +244,7 @@
         - 新增汇入预设关联字库\n
         - 简/繁体转换状态提示\n
         - 旧版 LIME HD 下载功能\n
+        - 新增 BIG5 字集注音及仓颉字根\n
         - 修正 Android 6 对话框显示问题\n\n
 
         5.0.6 版本更新\n\n

diff --git a/LimeStudio/app/src/main/res/values-zh-rCN/strings_settings.xml b/LimeStudio/app/src/main/res/values-zh-rCN/strings_settings.xml
@@ -530,6 +530,7 @@
     <string name="l3_im_download_from_cj_cns_start">开始下载仓颉CNS11643字根</string>
     <string name="l3_im_download_from_cj_cns_install">开始安装仓颉CNS11643字根</string>
 
+    <string name="l3_im_download_from_cj_big5">安装仓颉字根 (BIG5字集)</string>
     <string name="l3_im_download_from_cj">安装仓颉字根</string>
     <string name="l3_im_download_from_cj_start">开始下载仓颉字根</string>
     <string name="l3_im_download_from_cj_install">开始安装仓颉字根</string>

diff --git a/LimeStudio/app/src/main/res/values/strings.xml b/LimeStudio/app/src/main/res/values/strings.xml
@@ -245,6 +245,7 @@
         - 新增匯入預設關聯字庫\n
         - 簡/繁體轉換狀態提示\n
         - 舊版 LIMEHD 下載功能\n
+        - 新增 BIG5 字集注音及倉頡字根\n
         - 修正 Android 6 對話框顯示問題\n\n
 
         5.0.6 版本更新\n\n

diff --git a/LimeStudio/app/src/main/res/values/strings_settings.xml b/LimeStudio/app/src/main/res/values/strings_settings.xml
@@ -530,6 +530,7 @@
     <string name="l3_im_download_from_cj_cns_start">開始下載倉頡CNS11643字根</string>
     <string name="l3_im_download_from_cj_cns_install">開始安裝倉頡CNS11643字根</string>
 
+    <string name="l3_im_download_from_cj_big5">安裝倉頡字根 (BIG5字集)</string>
     <string name="l3_im_download_from_cj">安裝倉頡字根</string>
     <string name="l3_im_download_from_cj_start">開始下載倉頡字根</string>
     <string name="l3_im_download_from_cj_install">開始安裝倉頡字根</string>