diff --git a/Database/ecj.db b/Database/ecj.db
index cc9b07f2..bac7bd72 100644
Binary files a/Database/ecj.db and b/Database/ecj.db differ
diff --git a/Database/ecj.zip b/Database/ecj.zip
index d2569061..6813ad0f 100644
Binary files a/Database/ecj.zip and b/Database/ecj.zip differ
diff --git a/LimeStudio/app/app-release.apk b/LimeStudio/app/app-release.apk
index ff4d6a58..a250e0c3 100644
Binary files a/LimeStudio/app/app-release.apk and b/LimeStudio/app/app-release.apk differ
diff --git a/LimeStudio/app/build.gradle b/LimeStudio/app/build.gradle
index a9525701..3dd934a3 100644
--- a/LimeStudio/app/build.gradle
+++ b/LimeStudio/app/build.gradle
@@ -33,7 +33,7 @@ android {
applicationId "net.toload.main.hd"
minSdkVersion 16
targetSdkVersion 22
- versionCode 510
+ versionCode 511
versionName '5.0.3'
}
buildTypes {
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
index 3e0d6781..024c9826 100644
--- 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
@@ -58,7 +58,6 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
-import java.util.HashMap;
import java.util.List;
/**
@@ -282,14 +281,14 @@ public void onClick(View v) {
if (imtype.equals(Lime.DB_TABLE_PHONETIC)) {
- btnSetupImDialogLoad1.setText(getResources().getString(R.string.l3_im_download_from_phonetic));
+ btnSetupImDialogLoad1.setText(getResources().getString(R.string.l3_im_download_from_phonetic) + " (34,838)");
btnSetupImDialogLoad1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
downloadAndLoadIm(Lime.DB_TABLE_PHONETIC, Lime.IM_PHONETIC);
}
});
- btnSetupImDialogLoad2.setText(getResources().getString(R.string.l3_im_download_from_phonetic_adv));
+ btnSetupImDialogLoad2.setText(getResources().getString(R.string.l3_im_download_from_phonetic_adv) + " (95,029)");
btnSetupImDialogLoad2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -301,14 +300,14 @@ public void onClick(View v) {
} else if (imtype.equals(Lime.DB_TABLE_CJ)) {
- btnSetupImDialogLoad1.setText(getResources().getString(R.string.l3_im_download_from_cj));
+ btnSetupImDialogLoad1.setText(getResources().getString(R.string.l3_im_download_from_cj) + " (28,596)");
btnSetupImDialogLoad1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
downloadAndLoadIm(Lime.DB_TABLE_CJ, Lime.IM_CJ);
}
});
- btnSetupImDialogLoad2.setText(getResources().getString(R.string.l3_im_download_from_cjk_hk_cj));
+ btnSetupImDialogLoad2.setText(getResources().getString(R.string.l3_im_download_from_cjk_hk_cj) + " (30,278)");
btnSetupImDialogLoad2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -320,7 +319,7 @@ public void onClick(View v) {
} else if (imtype.equals(Lime.DB_TABLE_CJ5)) {
- btnSetupImDialogLoad1.setText(getResources().getString(R.string.l3_im_download_from_cj5));
+ btnSetupImDialogLoad1.setText(getResources().getString(R.string.l3_im_download_from_cj5) + " (24,004)");
btnSetupImDialogLoad1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -333,7 +332,7 @@ public void onClick(View v) {
} else if (imtype.equals(Lime.DB_TABLE_SCJ)) {
- btnSetupImDialogLoad1.setText(getResources().getString(R.string.l3_im_download_from_scj));
+ btnSetupImDialogLoad1.setText(getResources().getString(R.string.l3_im_download_from_scj) + " (74,250)");
btnSetupImDialogLoad1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -346,14 +345,14 @@ public void onClick(View v) {
} else if (imtype.equals(Lime.DB_TABLE_ECJ)) {
- btnSetupImDialogLoad1.setText(getResources().getString(R.string.l3_im_download_from_ecj));
+ btnSetupImDialogLoad1.setText(getResources().getString(R.string.l3_im_download_from_ecj) + " (13,119)");
btnSetupImDialogLoad1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
downloadAndLoadIm(Lime.DB_TABLE_ECJ, Lime.IM_ECJ);
}
});
- btnSetupImDialogLoad2.setText(getResources().getString(R.string.l3_im_download_from_cjk_hk_ecj));
+ btnSetupImDialogLoad2.setText(getResources().getString(R.string.l3_im_download_from_cjk_hk_ecj) + " (27,853)");
btnSetupImDialogLoad2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -365,32 +364,32 @@ public void onClick(View v) {
} else if (imtype.equals(Lime.DB_TABLE_DAYI)) {
- btnSetupImDialogLoad1.setText(getResources().getString(R.string.l3_im_download_from_dayi));
+ btnSetupImDialogLoad1.setText(getResources().getString(R.string.setup_load_download_dayiuni) + " (27,198)");
btnSetupImDialogLoad1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- downloadAndLoadIm(Lime.DB_TABLE_DAYI, Lime.IM_DAYI);
+ downloadAndLoadIm(Lime.DB_TABLE_DAYI, Lime.IM_DAYIUNI);
}
});
- btnSetupImDialogLoad2.setText(getResources().getString(R.string.setup_load_download_dayiuni));
+ btnSetupImDialogLoad2.setText(getResources().getString(R.string.setup_load_download_dayiunip) + " (117,766)");
btnSetupImDialogLoad2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- downloadAndLoadIm(Lime.DB_TABLE_DAYI, Lime.IM_DAYIUNI);
+ downloadAndLoadIm(Lime.DB_TABLE_DAYI, Lime.IM_DAYIUNIP);
}
});
- btnSetupImDialogLoad3.setText(getResources().getString(R.string.setup_load_download_dayiunip));
+ btnSetupImDialogLoad3.setText(getResources().getString(R.string.l3_im_download_from_dayi) + " (18,638)");
btnSetupImDialogLoad3.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- downloadAndLoadIm(Lime.DB_TABLE_DAYI, Lime.IM_DAYIUNIP);
+ downloadAndLoadIm(Lime.DB_TABLE_DAYI, Lime.IM_DAYI);
}
});
btnSetupImDialogLoad4.setVisibility(View.GONE);
} else if (imtype.equals(Lime.DB_TABLE_EZ)) {
- btnSetupImDialogLoad1.setText(getResources().getString(R.string.l3_im_download_from_ez));
+ btnSetupImDialogLoad1.setText(getResources().getString(R.string.l3_im_download_from_ez) + " (14,422)");
btnSetupImDialogLoad1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -403,7 +402,7 @@ public void onClick(View v) {
} else if (imtype.equals(Lime.DB_TABLE_ARRAY)) {
- btnSetupImDialogLoad1.setText(getResources().getString(R.string.l3_im_download_from_array));
+ btnSetupImDialogLoad1.setText(getResources().getString(R.string.l3_im_download_from_array) + " (31,999)");
btnSetupImDialogLoad1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -416,7 +415,7 @@ public void onClick(View v) {
} else if (imtype.equals(Lime.DB_TABLE_ARRAY10)) {
- btnSetupImDialogLoad1.setText(getResources().getString(R.string.l3_im_download_from_array10));
+ btnSetupImDialogLoad1.setText(getResources().getString(R.string.l3_im_download_from_array10) + " (31,700)");
btnSetupImDialogLoad1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -429,26 +428,27 @@ public void onClick(View v) {
} else if (imtype.equals(Lime.DB_TABLE_PINYIN)) {
- btnSetupImDialogLoad1.setText(getResources().getString(R.string.l3_im_download_from_pinyin_big5));
+ btnSetupImDialogLoad1.setText(getResources().getString(R.string.l3_im_download_from_pinyin_big5) + " (34,753)");
btnSetupImDialogLoad1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
downloadAndLoadIm(Lime.DB_TABLE_PINYIN, Lime.IM_PINYIN);
}
});
- btnSetupImDialogLoad2.setText(getResources().getString(R.string.l3_im_download_from_pinyin_gb));
+ /* btnSetupImDialogLoad2.setText(getResources().getString(R.string.l3_im_download_from_pinyin_gb) + " (34,753)");
btnSetupImDialogLoad2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
downloadAndLoadIm(Lime.DB_TABLE_PINYIN, Lime.IM_PINYINGB);
}
- });
+ });*/
+ btnSetupImDialogLoad2.setVisibility(View.GONE);
btnSetupImDialogLoad3.setVisibility(View.GONE);
btnSetupImDialogLoad4.setVisibility(View.GONE);
} else if (imtype.equals(Lime.DB_TABLE_WB)) {
- btnSetupImDialogLoad1.setText(getResources().getString(R.string.l3_im_download_from_wb));
+ btnSetupImDialogLoad1.setText(getResources().getString(R.string.l3_im_download_from_wb) + " (26,378)");
btnSetupImDialogLoad1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -460,28 +460,28 @@ public void onClick(View v) {
btnSetupImDialogLoad4.setVisibility(View.GONE);
} else if (imtype.equals(Lime.DB_TABLE_HS)) {
- btnSetupImDialogLoad1.setText(getResources().getString(R.string.l3_im_download_from_hs));
+ btnSetupImDialogLoad1.setText(getResources().getString(R.string.l3_im_download_from_hs) + " (183,659)");
btnSetupImDialogLoad1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
downloadAndLoadIm(Lime.DB_TABLE_HS, Lime.IM_HS);
}
});
- btnSetupImDialogLoad2.setText(getResources().getString(R.string.l3_im_download_from_hs_v1));
+ btnSetupImDialogLoad2.setText(getResources().getString(R.string.l3_im_download_from_hs_v1) + " (50,845)");
btnSetupImDialogLoad2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
downloadAndLoadIm(Lime.DB_TABLE_HS, Lime.IM_HS_V1);
}
});
- btnSetupImDialogLoad3.setText(getResources().getString(R.string.l3_im_download_from_hs_v2));
+ btnSetupImDialogLoad3.setText(getResources().getString(R.string.l3_im_download_from_hs_v2) + " (50,838)");
btnSetupImDialogLoad3.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
downloadAndLoadIm(Lime.DB_TABLE_HS, Lime.IM_HS_V2);
}
});
- btnSetupImDialogLoad4.setText(getResources().getString(R.string.l3_im_download_from_hs_v3));
+ btnSetupImDialogLoad4.setText(getResources().getString(R.string.l3_im_download_from_hs_v3) + " (64,324)");
btnSetupImDialogLoad4.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
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
index d1f05ed2..9fe22148 100644
--- a/LimeStudio/app/src/main/res/values-zh-rCN/strings_settings.xml
+++ b/LimeStudio/app/src/main/res/values-zh-rCN/strings_settings.xml
@@ -524,9 +524,9 @@
开始下载仓颉五代字根
开始安装仓颉五代字根
- 安装速成字根
- 开始下载速成字根
- 开始安装速成字根
+ 安装简易速成
+ 开始下载简易速成字根
+ 开始安装简易速成字根
安装快仓字根
开始下载快仓字根
@@ -570,7 +570,7 @@
开始安装仓颉香港字字根
- 安装拼音字根BIG5字集版本
+ 安装拼音字根
开始下载拼音字根BIG5字集版本
开始安装拼音字根BIG5字集版本
diff --git a/LimeStudio/app/src/main/res/values/strings_settings.xml b/LimeStudio/app/src/main/res/values/strings_settings.xml
index fbffe76d..6daa0994 100644
--- a/LimeStudio/app/src/main/res/values/strings_settings.xml
+++ b/LimeStudio/app/src/main/res/values/strings_settings.xml
@@ -524,9 +524,9 @@
開始下載倉頡五代字根
開始安裝倉頡五代字根
- 安裝速成字根
- 開始下載速成字根
- 開始安裝速成字根
+ 安裝簡易速成
+ 開始下載簡易速成字根
+ 開始安裝簡易速成字根
安裝快倉字根
開始下載快倉字根
@@ -544,7 +544,6 @@
開始下載輕鬆字根
開始安裝輕鬆字根
-
安裝注音字根
開始下載注音字根
開始安裝注音字根
@@ -570,7 +569,7 @@
開始安裝倉頡香港字字根
- 安裝拼音字根BIG5字集版本
+ 安裝拼音字根
開始下載拼音字根BIG5字集版本
開始安裝拼音字根BIG5字集版本