Skip to content

Commit

Permalink
整理字符串资源定义
Browse files Browse the repository at this point in the history
  • Loading branch information
@eritpchy
eritpchy committed Dec 7, 2017
1 parent 02de330 commit d45cd73
Show file tree
Hide file tree
Showing 14 changed files with 275 additions and 259 deletions.
215 changes: 72 additions & 143 deletions app/src/main/java/com/yyxx/wechatfp/Lang.java
View file

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions app/src/main/java/com/yyxx/wechatfp/activity/HomeActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,17 @@ public void onCreate(Bundle savedInstanceState) {

ListView listView = (ListView) findViewById(R.id.list);
List<PreferenceAdapter.Data> list = new ArrayList<>();
list.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_HELP_WECHAT), Lang.getString(Lang.SETTINGS_SUB_TITLE_HELP_WECHAT)));
list.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_HELP_ALIPAY), Lang.getString(Lang.SETTINGS_SUB_TITLE_HELP_ALIPAY)));
list.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_HELP_TAOBAO), Lang.getString(Lang.SETTINGS_SUB_TITLE_HELP_TAOBAO)));
list.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_HELP_QQ), Lang.getString(Lang.SETTINGS_SUB_TITLE_HELP_QQ)));
list.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_HELP_FAQ), Lang.getString(Lang.SETTINGS_SUB_TITLE_HELP_FAQ)));
list.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_QQ_GROUP), Lang.getString(Lang.SETTINGS_SUB_TITLE_QQ_GROUP)));
list.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_CHECKUPDATE), Lang.getString(Lang.SETTINGS_SUB_TITLE_CHECKUPDATE)));
list.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_LICENSE), Lang.getString(Lang.SETTINGS_SUB_TITLE_LICENSE)));
list.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_WEBSIDE), PROJECT_URL));
list.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_DONATE), Lang.getString(Lang.SETTINGS_SUB_TITLE_DONATE)));
list.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_VERSION), BuildConfig.VERSION_NAME));
list.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_help_wechat), Lang.getString(R.id.settings_sub_title_help_wechat)));
list.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_help_alipay), Lang.getString(R.id.settings_sub_title_help_alipay)));
list.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_help_taobao), Lang.getString(R.id.settings_sub_title_help_taobao)));
list.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_help_qq), Lang.getString(R.id.settings_sub_title_help_qq)));
list.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_help_faq), Lang.getString(R.id.settings_sub_title_help_faq)));
list.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_qq_group), Lang.getString(R.id.settings_sub_title_qq_group)));
list.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_checkupdate), Lang.getString(R.id.settings_sub_title_checkupdate)));
list.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_license), Lang.getString(R.id.settings_sub_title_license)));
list.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_webside), PROJECT_URL));
list.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_donate), Lang.getString(R.id.settings_sub_title_donate)));
list.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_version), BuildConfig.VERSION_NAME));
mListAdapter = new PreferenceAdapter(list);
listView.setAdapter(mListAdapter);
listView.setOnItemClickListener(this);
Expand All @@ -71,27 +71,27 @@ public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
if (data == null || TextUtils.isEmpty(data.title)) {
return;
}
if (Lang.getString(Lang.SETTINGS_TITLE_HELP_WECHAT).equals(data.title)) {
if (Lang.getString(R.id.settings_title_help_wechat).equals(data.title)) {
WebActivity.openUrl(this, HELP_URL_WECHAT);
} else if (Lang.getString(Lang.SETTINGS_TITLE_HELP_ALIPAY).equals(data.title)) {
} else if (Lang.getString(R.id.settings_title_help_alipay).equals(data.title)) {
WebActivity.openUrl(this, HELP_URL_ALIPAY);
} else if (Lang.getString(Lang.SETTINGS_TITLE_HELP_TAOBAO).equals(data.title)) {
} else if (Lang.getString(R.id.settings_title_help_taobao).equals(data.title)) {
WebActivity.openUrl(this, HELP_URL_TAOBAO);
} else if (Lang.getString(Lang.SETTINGS_TITLE_HELP_QQ).equals(data.title)) {
} else if (Lang.getString(R.id.settings_title_help_qq).equals(data.title)) {
WebActivity.openUrl(this, HELP_URL_QQ);
} else if (Lang.getString(Lang.SETTINGS_TITLE_HELP_FAQ).equals(data.title)) {
} else if (Lang.getString(R.id.settings_title_help_faq).equals(data.title)) {
WebActivity.openUrl(this, HELP_URL_FAQ);
} else if (Lang.getString(Lang.SETTINGS_TITLE_QQ_GROUP).equals(data.title)) {
} else if (Lang.getString(R.id.settings_title_qq_group).equals(data.title)) {
joinQQGroup();
} else if (Lang.getString(Lang.SETTINGS_TITLE_DONATE).equals(data.title)) {
} else if (Lang.getString(R.id.settings_title_donate).equals(data.title)) {
new DonateView(this).showInDialog();
} else if (Lang.getString(Lang.SETTINGS_TITLE_CHECKUPDATE).equals(data.title)) {
} else if (Lang.getString(R.id.settings_title_checkupdate).equals(data.title)) {
UpdateFactory.doUpdateCheck(this, false, true);
} else if (Lang.getString(Lang.SETTINGS_TITLE_LICENSE).equals(data.title)) {
} else if (Lang.getString(R.id.settings_title_license).equals(data.title)) {
WebActivity.openUrl(this, HELP_URL_LICENSE);
} else if (Lang.getString(Lang.SETTINGS_TITLE_WEBSIDE).equals(data.title)) {
} else if (Lang.getString(R.id.settings_title_webside).equals(data.title)) {
UrlUtil.openUrl(this, PROJECT_URL);
Toast.makeText(this, Lang.getString(Lang.TOAST_GIVE_ME_STAR), Toast.LENGTH_LONG).show();
Toast.makeText(this, Lang.getString(R.id.toast_give_me_star), Toast.LENGTH_LONG).show();
}
}

Expand Down
9 changes: 5 additions & 4 deletions app/src/main/java/com/yyxx/wechatfp/network/updateCheck/UpdateFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import android.widget.Toast;

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

public static void doUpdateCheck(final Context context, final boolean quite, final boolean dontSkip) {
if (!quite) {
Toast.makeText(context, Lang.getString(Lang.TOAST_CHECKING_UPDATE), Toast.LENGTH_LONG).show();
Toast.makeText(context, Lang.getString(R.id.toast_checking_update), Toast.LENGTH_LONG).show();
}
try {
new GithubUpdateChecker(new UpdateResultListener() {
@Override
public void onNoUpdate() {
if (!quite) {
Toast.makeText(context, Lang.getString(Lang.TOAST_NO_UPDATE), Toast.LENGTH_LONG).show();
Toast.makeText(context, Lang.getString(R.id.toast_no_update), Toast.LENGTH_LONG).show();
}
}

@Override
public void onNetErr() {
if (!quite) {
Toast.makeText(context, Lang.getString(Lang.TOAST_CHECK_UPDATE_FAIL_NET_ERR), Toast.LENGTH_LONG).show();
Toast.makeText(context, Lang.getString(R.id.toast_check_update_fail_net_err), Toast.LENGTH_LONG).show();
}
}

Expand All @@ -51,7 +52,7 @@ public void onHasUpdate(final String version, String content, final String pageU
}
}
UpdateInfoView updateInfoView = new UpdateInfoView(context);
updateInfoView.setTitle(Lang.getString(Lang.FOUND_NEW_VERSION) + version);
updateInfoView.setTitle(Lang.getString(R.id.found_new_version) + version);
updateInfoView.setContent(content);
updateInfoView.withOnNeutralButtonClickListener((dialogInterface, i) -> {
Config.from(context).setSkipVersion(version);
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/java/com/yyxx/wechatfp/network/updateCheck/github/GithubUpdateChecker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import com.google.gson.Gson;
import com.yyxx.wechatfp.BuildConfig;
import com.yyxx.wechatfp.Constant;
import com.yyxx.wechatfp.Lang;
import com.yyxx.wechatfp.R;
import com.yyxx.wechatfp.network.inf.UpdateResultListener;
import com.yyxx.wechatfp.network.updateCheck.BaseUpdateChecker;
import com.yyxx.wechatfp.network.updateCheck.github.bean.GithubLatestInfo;
Expand Down Expand Up @@ -53,7 +55,7 @@ public void onResponse(Call call, Response response) throws IOException {
String content = info.content;
Date date = info.date;
if (date != null) {
content = content + "\n\n更新日期: " + DateUtil.toString(date);
content = content + "\n\n" + Lang.getString(R.id.update_time) + ": " + DateUtil.toString(date);
}
onHasUpdate(info.version, content, info.contentUrl, info.getDownloadUrl());
} else {
Expand Down
19 changes: 10 additions & 9 deletions app/src/main/java/com/yyxx/wechatfp/view/DonateView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import com.yyxx.wechatfp.Constant;
import com.yyxx.wechatfp.Lang;
import com.yyxx.wechatfp.R;
import com.yyxx.wechatfp.adapter.PreferenceAdapter;
import com.yyxx.wechatfp.util.DonateUtil;
import com.yyxx.wechatfp.util.DpUtil;
Expand Down Expand Up @@ -59,11 +60,11 @@ private void init(Context context) {
mListView.setPadding(defHPadding, defVPadding, defHPadding, defVPadding);
mListView.setDivider(new ColorDrawable(Color.TRANSPARENT));

mSettingsDataList.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_ALIPAY), Constant.AUTHOR_ALIPAY));
mSettingsDataList.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_alipay), Constant.AUTHOR_ALIPAY));
if (Constant.PACKAGE_NAME_WECHAT.equals(context.getPackageName())) {
mSettingsDataList.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_WECHAT), Constant.AUTHOR_WECHAT));
mSettingsDataList.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_wechat), Constant.AUTHOR_WECHAT));
} else if (Constant.PACKAGE_NAME_QQ.equals(context.getPackageName())) {
mSettingsDataList.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_QQ), Constant.AUTHOR_QQ));
mSettingsDataList.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_qq), Constant.AUTHOR_QQ));
}
mListAdapter = new PreferenceAdapter(mSettingsDataList);

Expand All @@ -82,17 +83,17 @@ protected void onAttachedToWindow() {
public void onItemClick(AdapterView<?> adapterView, View view, int position, long l) {
PreferenceAdapter.Data data = mListAdapter.getItem(position);
final Context context = getContext();
if (Lang.getString(Lang.SETTINGS_TITLE_ALIPAY).equals(data.title)) {
if (Lang.getString(R.id.settings_title_alipay).equals(data.title)) {
if (!DonateUtil.openAlipayPayPage(context)) {
Toast.makeText(context, Lang.getString(Lang.TOAST_GOTO_DONATE_PAGE_FAIL_ALIPAY), Toast.LENGTH_LONG).show();
Toast.makeText(context, Lang.getString(R.id.toast_goto_donate_page_fail_alipay), Toast.LENGTH_LONG).show();
}
} else if (Lang.getString(Lang.SETTINGS_TITLE_WECHAT).equals(data.title)) {
} else if (Lang.getString(R.id.settings_title_wechat).equals(data.title)) {
if (!DonateUtil.openWeChatPay(context)) {
Toast.makeText(context, Lang.getString(Lang.TOAST_GOTO_DONATE_PAGE_FAIL_WECHAT), Toast.LENGTH_LONG).show();
Toast.makeText(context, Lang.getString(R.id.toast_goto_donate_page_fail_wechat), Toast.LENGTH_LONG).show();
}
} else if (Lang.getString(Lang.SETTINGS_TITLE_QQ).equals(data.title)) {
} else if (Lang.getString(R.id.settings_title_qq).equals(data.title)) {
if (!DonateUtil.openQQPay(context)) {
Toast.makeText(context, Lang.getString(Lang.TOAST_GOTO_DONATE_PAGE_FAIL_QQ), Toast.LENGTH_LONG).show();
Toast.makeText(context, Lang.getString(R.id.toast_goto_donate_page_fail_qq), Toast.LENGTH_LONG).show();
}
}
}
Expand Down
7 changes: 4 additions & 3 deletions app/src/main/java/com/yyxx/wechatfp/view/LicenseView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import com.yyxx.wechatfp.Constant;
import com.yyxx.wechatfp.Lang;
import com.yyxx.wechatfp.R;
import com.yyxx.wechatfp.util.DpUtil;
import com.yyxx.wechatfp.util.Task;
import com.yyxx.wechatfp.util.UrlUtil;
Expand Down Expand Up @@ -58,8 +59,8 @@ private void init(Context context) {
} catch (Exception e) {
L.e(e);
}
withNegativeButtonText(Lang.getString(Lang.DISAGREE));
withPositiveButtonText(Lang.getString(Lang.AGREE));
withNegativeButtonText(Lang.getString(R.id.disagree));
withPositiveButtonText(Lang.getString(R.id.agree));
}

private ProgressBar initProgressBar(Context context) {
Expand Down Expand Up @@ -130,6 +131,6 @@ private void handleProgressChanged(int progress) {

@Override
public String getDialogTitle() {
return Lang.getString(Lang.SETTINGS_TITLE_LICENSE);
return Lang.getString(R.id.settings_title_license);
}
}
5 changes: 3 additions & 2 deletions app/src/main/java/com/yyxx/wechatfp/view/PasswordInputView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import com.yyxx.wechatfp.Constant;
import com.yyxx.wechatfp.Lang;
import com.yyxx.wechatfp.R;
import com.yyxx.wechatfp.util.DpUtil;

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

withPositiveButtonText(Lang.getString(Lang.OK));
withPositiveButtonText(Lang.getString(R.id.ok));
}

@NonNull
Expand Down Expand Up @@ -112,6 +113,6 @@ protected void onAttachedToWindow() {

@Override
public String getDialogTitle() {
return Lang.getString(Lang.ENTER_PASSWORD);
return Lang.getString(R.id.enter_password);
}
}
Loading

0 comments on commit d45cd73

Please sign in to comment.