Skip to content

Commit d45cd73

Browse files
eritpchyeritpchy
committed
整理字符串资源定义
1 parent 02de330 commit d45cd73

File tree

14 files changed

+275
-259
lines changed

14 files changed

+275
-259
lines changed

‎app/src/main/java/com/yyxx/wechatfp/Lang.java‎

Lines changed: 72 additions & 143 deletions
Large diffs are not rendered by default.

‎app/src/main/java/com/yyxx/wechatfp/activity/HomeActivity.java‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,17 @@ public void onCreate(Bundle savedInstanceState) {
4747

4848
ListView listView = (ListView) findViewById(R.id.list);
4949
List<PreferenceAdapter.Data> list = new ArrayList<>();
50-
list.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_HELP_WECHAT), Lang.getString(Lang.SETTINGS_SUB_TITLE_HELP_WECHAT)));
51-
list.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_HELP_ALIPAY), Lang.getString(Lang.SETTINGS_SUB_TITLE_HELP_ALIPAY)));
52-
list.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_HELP_TAOBAO), Lang.getString(Lang.SETTINGS_SUB_TITLE_HELP_TAOBAO)));
53-
list.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_HELP_QQ), Lang.getString(Lang.SETTINGS_SUB_TITLE_HELP_QQ)));
54-
list.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_HELP_FAQ), Lang.getString(Lang.SETTINGS_SUB_TITLE_HELP_FAQ)));
55-
list.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_QQ_GROUP), Lang.getString(Lang.SETTINGS_SUB_TITLE_QQ_GROUP)));
56-
list.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_CHECKUPDATE), Lang.getString(Lang.SETTINGS_SUB_TITLE_CHECKUPDATE)));
57-
list.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_LICENSE), Lang.getString(Lang.SETTINGS_SUB_TITLE_LICENSE)));
58-
list.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_WEBSIDE), PROJECT_URL));
59-
list.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_DONATE), Lang.getString(Lang.SETTINGS_SUB_TITLE_DONATE)));
60-
list.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_VERSION), BuildConfig.VERSION_NAME));
50+
list.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_help_wechat), Lang.getString(R.id.settings_sub_title_help_wechat)));
51+
list.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_help_alipay), Lang.getString(R.id.settings_sub_title_help_alipay)));
52+
list.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_help_taobao), Lang.getString(R.id.settings_sub_title_help_taobao)));
53+
list.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_help_qq), Lang.getString(R.id.settings_sub_title_help_qq)));
54+
list.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_help_faq), Lang.getString(R.id.settings_sub_title_help_faq)));
55+
list.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_qq_group), Lang.getString(R.id.settings_sub_title_qq_group)));
56+
list.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_checkupdate), Lang.getString(R.id.settings_sub_title_checkupdate)));
57+
list.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_license), Lang.getString(R.id.settings_sub_title_license)));
58+
list.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_webside), PROJECT_URL));
59+
list.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_donate), Lang.getString(R.id.settings_sub_title_donate)));
60+
list.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_version), BuildConfig.VERSION_NAME));
6161
mListAdapter = new PreferenceAdapter(list);
6262
listView.setAdapter(mListAdapter);
6363
listView.setOnItemClickListener(this);
@@ -71,27 +71,27 @@ public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
7171
if (data == null || TextUtils.isEmpty(data.title)) {
7272
return;
7373
}
74-
if (Lang.getString(Lang.SETTINGS_TITLE_HELP_WECHAT).equals(data.title)) {
74+
if (Lang.getString(R.id.settings_title_help_wechat).equals(data.title)) {
7575
WebActivity.openUrl(this, HELP_URL_WECHAT);
76-
} else if (Lang.getString(Lang.SETTINGS_TITLE_HELP_ALIPAY).equals(data.title)) {
76+
} else if (Lang.getString(R.id.settings_title_help_alipay).equals(data.title)) {
7777
WebActivity.openUrl(this, HELP_URL_ALIPAY);
78-
} else if (Lang.getString(Lang.SETTINGS_TITLE_HELP_TAOBAO).equals(data.title)) {
78+
} else if (Lang.getString(R.id.settings_title_help_taobao).equals(data.title)) {
7979
WebActivity.openUrl(this, HELP_URL_TAOBAO);
80-
} else if (Lang.getString(Lang.SETTINGS_TITLE_HELP_QQ).equals(data.title)) {
80+
} else if (Lang.getString(R.id.settings_title_help_qq).equals(data.title)) {
8181
WebActivity.openUrl(this, HELP_URL_QQ);
82-
} else if (Lang.getString(Lang.SETTINGS_TITLE_HELP_FAQ).equals(data.title)) {
82+
} else if (Lang.getString(R.id.settings_title_help_faq).equals(data.title)) {
8383
WebActivity.openUrl(this, HELP_URL_FAQ);
84-
} else if (Lang.getString(Lang.SETTINGS_TITLE_QQ_GROUP).equals(data.title)) {
84+
} else if (Lang.getString(R.id.settings_title_qq_group).equals(data.title)) {
8585
joinQQGroup();
86-
} else if (Lang.getString(Lang.SETTINGS_TITLE_DONATE).equals(data.title)) {
86+
} else if (Lang.getString(R.id.settings_title_donate).equals(data.title)) {
8787
new DonateView(this).showInDialog();
88-
} else if (Lang.getString(Lang.SETTINGS_TITLE_CHECKUPDATE).equals(data.title)) {
88+
} else if (Lang.getString(R.id.settings_title_checkupdate).equals(data.title)) {
8989
UpdateFactory.doUpdateCheck(this, false, true);
90-
} else if (Lang.getString(Lang.SETTINGS_TITLE_LICENSE).equals(data.title)) {
90+
} else if (Lang.getString(R.id.settings_title_license).equals(data.title)) {
9191
WebActivity.openUrl(this, HELP_URL_LICENSE);
92-
} else if (Lang.getString(Lang.SETTINGS_TITLE_WEBSIDE).equals(data.title)) {
92+
} else if (Lang.getString(R.id.settings_title_webside).equals(data.title)) {
9393
UrlUtil.openUrl(this, PROJECT_URL);
94-
Toast.makeText(this, Lang.getString(Lang.TOAST_GIVE_ME_STAR), Toast.LENGTH_LONG).show();
94+
Toast.makeText(this, Lang.getString(R.id.toast_give_me_star), Toast.LENGTH_LONG).show();
9595
}
9696
}
9797

‎app/src/main/java/com/yyxx/wechatfp/network/updateCheck/UpdateFactory.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import android.widget.Toast;
66

77
import com.yyxx.wechatfp.Lang;
8+
import com.yyxx.wechatfp.R;
89
import com.yyxx.wechatfp.network.inf.UpdateResultListener;
910
import com.yyxx.wechatfp.network.updateCheck.github.GithubUpdateChecker;
1011
import com.yyxx.wechatfp.util.Config;
@@ -24,21 +25,21 @@ public static void doUpdateCheck(final Context context) {
2425

2526
public static void doUpdateCheck(final Context context, final boolean quite, final boolean dontSkip) {
2627
if (!quite) {
27-
Toast.makeText(context, Lang.getString(Lang.TOAST_CHECKING_UPDATE), Toast.LENGTH_LONG).show();
28+
Toast.makeText(context, Lang.getString(R.id.toast_checking_update), Toast.LENGTH_LONG).show();
2829
}
2930
try {
3031
new GithubUpdateChecker(new UpdateResultListener() {
3132
@Override
3233
public void onNoUpdate() {
3334
if (!quite) {
34-
Toast.makeText(context, Lang.getString(Lang.TOAST_NO_UPDATE), Toast.LENGTH_LONG).show();
35+
Toast.makeText(context, Lang.getString(R.id.toast_no_update), Toast.LENGTH_LONG).show();
3536
}
3637
}
3738

3839
@Override
3940
public void onNetErr() {
4041
if (!quite) {
41-
Toast.makeText(context, Lang.getString(Lang.TOAST_CHECK_UPDATE_FAIL_NET_ERR), Toast.LENGTH_LONG).show();
42+
Toast.makeText(context, Lang.getString(R.id.toast_check_update_fail_net_err), Toast.LENGTH_LONG).show();
4243
}
4344
}
4445

@@ -51,7 +52,7 @@ public void onHasUpdate(final String version, String content, final String pageU
5152
}
5253
}
5354
UpdateInfoView updateInfoView = new UpdateInfoView(context);
54-
updateInfoView.setTitle(Lang.getString(Lang.FOUND_NEW_VERSION) + version);
55+
updateInfoView.setTitle(Lang.getString(R.id.found_new_version) + version);
5556
updateInfoView.setContent(content);
5657
updateInfoView.withOnNeutralButtonClickListener((dialogInterface, i) -> {
5758
Config.from(context).setSkipVersion(version);

‎app/src/main/java/com/yyxx/wechatfp/network/updateCheck/github/GithubUpdateChecker.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import com.google.gson.Gson;
44
import com.yyxx.wechatfp.BuildConfig;
55
import com.yyxx.wechatfp.Constant;
6+
import com.yyxx.wechatfp.Lang;
7+
import com.yyxx.wechatfp.R;
68
import com.yyxx.wechatfp.network.inf.UpdateResultListener;
79
import com.yyxx.wechatfp.network.updateCheck.BaseUpdateChecker;
810
import com.yyxx.wechatfp.network.updateCheck.github.bean.GithubLatestInfo;
@@ -53,7 +55,7 @@ public void onResponse(Call call, Response response) throws IOException {
5355
String content = info.content;
5456
Date date = info.date;
5557
if (date != null) {
56-
content = content + "\n\n更新日期: " + DateUtil.toString(date);
58+
content = content + "\n\n" + Lang.getString(R.id.update_time) + ": " + DateUtil.toString(date);
5759
}
5860
onHasUpdate(info.version, content, info.contentUrl, info.getDownloadUrl());
5961
} else {

‎app/src/main/java/com/yyxx/wechatfp/view/DonateView.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
import com.yyxx.wechatfp.Constant;
1616
import com.yyxx.wechatfp.Lang;
17+
import com.yyxx.wechatfp.R;
1718
import com.yyxx.wechatfp.adapter.PreferenceAdapter;
1819
import com.yyxx.wechatfp.util.DonateUtil;
1920
import com.yyxx.wechatfp.util.DpUtil;
@@ -59,11 +60,11 @@ private void init(Context context) {
5960
mListView.setPadding(defHPadding, defVPadding, defHPadding, defVPadding);
6061
mListView.setDivider(new ColorDrawable(Color.TRANSPARENT));
6162

62-
mSettingsDataList.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_ALIPAY), Constant.AUTHOR_ALIPAY));
63+
mSettingsDataList.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_alipay), Constant.AUTHOR_ALIPAY));
6364
if (Constant.PACKAGE_NAME_WECHAT.equals(context.getPackageName())) {
64-
mSettingsDataList.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_WECHAT), Constant.AUTHOR_WECHAT));
65+
mSettingsDataList.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_wechat), Constant.AUTHOR_WECHAT));
6566
} else if (Constant.PACKAGE_NAME_QQ.equals(context.getPackageName())) {
66-
mSettingsDataList.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_QQ), Constant.AUTHOR_QQ));
67+
mSettingsDataList.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_qq), Constant.AUTHOR_QQ));
6768
}
6869
mListAdapter = new PreferenceAdapter(mSettingsDataList);
6970

@@ -82,17 +83,17 @@ protected void onAttachedToWindow() {
8283
public void onItemClick(AdapterView<?> adapterView, View view, int position, long l) {
8384
PreferenceAdapter.Data data = mListAdapter.getItem(position);
8485
final Context context = getContext();
85-
if (Lang.getString(Lang.SETTINGS_TITLE_ALIPAY).equals(data.title)) {
86+
if (Lang.getString(R.id.settings_title_alipay).equals(data.title)) {
8687
if (!DonateUtil.openAlipayPayPage(context)) {
87-
Toast.makeText(context, Lang.getString(Lang.TOAST_GOTO_DONATE_PAGE_FAIL_ALIPAY), Toast.LENGTH_LONG).show();
88+
Toast.makeText(context, Lang.getString(R.id.toast_goto_donate_page_fail_alipay), Toast.LENGTH_LONG).show();
8889
}
89-
} else if (Lang.getString(Lang.SETTINGS_TITLE_WECHAT).equals(data.title)) {
90+
} else if (Lang.getString(R.id.settings_title_wechat).equals(data.title)) {
9091
if (!DonateUtil.openWeChatPay(context)) {
91-
Toast.makeText(context, Lang.getString(Lang.TOAST_GOTO_DONATE_PAGE_FAIL_WECHAT), Toast.LENGTH_LONG).show();
92+
Toast.makeText(context, Lang.getString(R.id.toast_goto_donate_page_fail_wechat), Toast.LENGTH_LONG).show();
9293
}
93-
} else if (Lang.getString(Lang.SETTINGS_TITLE_QQ).equals(data.title)) {
94+
} else if (Lang.getString(R.id.settings_title_qq).equals(data.title)) {
9495
if (!DonateUtil.openQQPay(context)) {
95-
Toast.makeText(context, Lang.getString(Lang.TOAST_GOTO_DONATE_PAGE_FAIL_QQ), Toast.LENGTH_LONG).show();
96+
Toast.makeText(context, Lang.getString(R.id.toast_goto_donate_page_fail_qq), Toast.LENGTH_LONG).show();
9697
}
9798
}
9899
}

‎app/src/main/java/com/yyxx/wechatfp/view/LicenseView.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import com.yyxx.wechatfp.Constant;
2121
import com.yyxx.wechatfp.Lang;
22+
import com.yyxx.wechatfp.R;
2223
import com.yyxx.wechatfp.util.DpUtil;
2324
import com.yyxx.wechatfp.util.Task;
2425
import com.yyxx.wechatfp.util.UrlUtil;
@@ -58,8 +59,8 @@ private void init(Context context) {
5859
} catch (Exception e) {
5960
L.e(e);
6061
}
61-
withNegativeButtonText(Lang.getString(Lang.DISAGREE));
62-
withPositiveButtonText(Lang.getString(Lang.AGREE));
62+
withNegativeButtonText(Lang.getString(R.id.disagree));
63+
withPositiveButtonText(Lang.getString(R.id.agree));
6364
}
6465

6566
private ProgressBar initProgressBar(Context context) {
@@ -130,6 +131,6 @@ private void handleProgressChanged(int progress) {
130131

131132
@Override
132133
public String getDialogTitle() {
133-
return Lang.getString(Lang.SETTINGS_TITLE_LICENSE);
134+
return Lang.getString(R.id.settings_title_license);
134135
}
135136
}

‎app/src/main/java/com/yyxx/wechatfp/view/PasswordInputView.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
import com.yyxx.wechatfp.Constant;
1818
import com.yyxx.wechatfp.Lang;
19+
import com.yyxx.wechatfp.R;
1920
import com.yyxx.wechatfp.util.DpUtil;
2021

2122
/**
@@ -83,7 +84,7 @@ private void initView(Context context) {
8384
rootLLayoutParams.setMargins(defHMargin, defTMargin, defHMargin, DpUtil.dip2px(context, 20));
8485
this.addView(rootLLayout, rootLLayoutParams);
8586

86-
withPositiveButtonText(Lang.getString(Lang.OK));
87+
withPositiveButtonText(Lang.getString(R.id.ok));
8788
}
8889

8990
@NonNull
@@ -112,6 +113,6 @@ protected void onAttachedToWindow() {
112113

113114
@Override
114115
public String getDialogTitle() {
115-
return Lang.getString(Lang.ENTER_PASSWORD);
116+
return Lang.getString(R.id.enter_password);
116117
}
117118
}

0 commit comments

Comments
 (0)