Skip to content

Commit

Permalink
update database
Browse files Browse the repository at this point in the history
  • Loading branch information
@hosoyu
hosoyu committed Jul 12, 2015
1 parent 8dd30b0 commit 1f77deb
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 36 deletions.
Binary file modified Database/ecj.db
View file
Binary file not shown.
Binary file modified Database/ecj.zip
View file
Binary file not shown.
Binary file modified LimeStudio/app/app-release.apk
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion LimeStudio/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ android {
applicationId "net.toload.main.hd"
minSdkVersion 16
targetSdkVersion 22
versionCode 510
versionCode 511
versionName '5.0.3'
}
buildTypes {
Expand Down
52 changes: 26 additions & 26 deletions LimeStudio/app/src/main/java/net/toload/main/hd/ui/SetupImLoadDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;

/**
Expand Down Expand Up @@ -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) {
Expand All @@ -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) {
Expand All @@ -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) {
Expand All @@ -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) {
Expand All @@ -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) {
Expand All @@ -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) {
Expand All @@ -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) {
Expand All @@ -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) {
Expand All @@ -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) {
Expand All @@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions LimeStudio/app/src/main/res/values-zh-rCN/strings_settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,9 +524,9 @@
<string name="l3_im_download_from_cj5_start">开始下载仓颉五代字根</string>
<string name="l3_im_download_from_cj5_install">开始安装仓颉五代字根</string>

<string name="l3_im_download_from_ecj">安装速成字根</string>
<string name="l3_im_download_from_ecj_start">开始下载速成字根</string>
<string name="l3_im_download_from_ecj_install">开始安装速成字根</string>
<string name="l3_im_download_from_ecj">安装简易速成</string>
<string name="l3_im_download_from_ecj_start">开始下载简易速成字根</string>
<string name="l3_im_download_from_ecj_install">开始安装简易速成字根</string>

<string name="l3_im_download_from_scj">安装快仓字根</string>
<string name="l3_im_download_from_scj_start">开始下载快仓字根</string>
Expand Down Expand Up @@ -570,7 +570,7 @@
<string name="l3_im_download_from_cjk_hk_cj_install">开始安装仓颉香港字字根</string>


<string name="l3_im_download_from_pinyin_big5">安装拼音字根BIG5字集版本</string>
<string name="l3_im_download_from_pinyin_big5">安装拼音字根</string>
<string name="l3_im_download_from_pinyin_big5_start">开始下载拼音字根BIG5字集版本</string>
<string name="l3_im_download_from_pinyin_big5_install">开始安装拼音字根BIG5字集版本</string>

Expand Down
9 changes: 4 additions & 5 deletions LimeStudio/app/src/main/res/values/strings_settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,9 +524,9 @@
<string name="l3_im_download_from_cj5_start">開始下載倉頡五代字根</string>
<string name="l3_im_download_from_cj5_install">開始安裝倉頡五代字根</string>

<string name="l3_im_download_from_ecj">安裝速成字根</string>
<string name="l3_im_download_from_ecj_start">開始下載速成字根</string>
<string name="l3_im_download_from_ecj_install">開始安裝速成字根</string>
<string name="l3_im_download_from_ecj">安裝簡易速成</string>
<string name="l3_im_download_from_ecj_start">開始下載簡易速成字根</string>
<string name="l3_im_download_from_ecj_install">開始安裝簡易速成字根</string>

<string name="l3_im_download_from_scj">安裝快倉字根</string>
<string name="l3_im_download_from_scj_start">開始下載快倉字根</string>
Expand All @@ -544,7 +544,6 @@
<string name="l3_im_download_from_ez_start">開始下載輕鬆字根</string>
<string name="l3_im_download_from_ez_install">開始安裝輕鬆字根</string>


<string name="l3_im_download_from_cjk_phonetic">安裝注音字根</string>
<string name="l3_im_download_from_cjk_phonetic_start">開始下載注音字根</string>
<string name="l3_im_download_from_cjk_phonetic_install">開始安裝注音字根</string>
Expand All @@ -570,7 +569,7 @@
<string name="l3_im_download_from_cjk_hk_cj_install">開始安裝倉頡香港字字根</string>


<string name="l3_im_download_from_pinyin_big5">安裝拼音字根BIG5字集版本</string>
<string name="l3_im_download_from_pinyin_big5">安裝拼音字根</string>
<string name="l3_im_download_from_pinyin_big5_start">開始下載拼音字根BIG5字集版本</string>
<string name="l3_im_download_from_pinyin_big5_install">開始安裝拼音字根BIG5字集版本</string>

Expand Down

0 comments on commit 1f77deb

Please sign in to comment.