diff --git a/app/src/main/java/com/tokenbank/activity/AboutActivity.java b/app/src/main/java/com/tokenbank/activity/AboutActivity.java index 31016d8..00692e8 100755 --- a/app/src/main/java/com/tokenbank/activity/AboutActivity.java +++ b/app/src/main/java/com/tokenbank/activity/AboutActivity.java @@ -31,12 +31,12 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { mTitleBar = (TitleBar) findViewById(R.id.title_bar); mTitleBar.setLeftDrawable(R.drawable.ic_back); - mTitleBar.setTitle(getString(R.string.title_about_us)); + mTitleBar.setTitle(getString(R.string.titleBar_about)); mTitleBar.setRightTextColor(R.color.white); mTitleBar.setTitleBarClickListener(this); mTvVersion = (TextView) findViewById(R.id.tv_version); - mTvVersion.setText(getString(R.string.str_current_version) + DeviceUtil.getVersionName()); + mTvVersion.setText(getString(R.string.content_version) + DeviceUtil.getVersionName()); mLayoutUserTerms = (RelativeLayout) findViewById(R.id.layout_use_terms); mLayoutUserTerms.setOnClickListener(this); @@ -51,13 +51,13 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { @Override public void onClick(View view) { if (view == mLayoutUserTerms) { - WebBrowserActivity.startWebBrowserActivity(AboutActivity.this, getString(R.string.title_agreement), Constant.service_term_url); + WebBrowserActivity.startWebBrowserActivity(AboutActivity.this, getString(R.string.titleBar_agreement), Constant.service_term_url); } else if (view == mLayoutPrivliTerms) { - WebBrowserActivity.startWebBrowserActivity(AboutActivity.this, getString(R.string.title_privacy_policy), Constant.privilege_url); + WebBrowserActivity.startWebBrowserActivity(AboutActivity.this, getString(R.string.titleBar_privacy), Constant.privilege_url); } else if (view == mLayoutCheckUpdate) { - ToastUtil.toast(AboutActivity.this, getString(R.string.str_latest_version)); + ToastUtil.toast(AboutActivity.this, getString(R.string.toast_latest_version)); } } diff --git a/app/src/main/java/com/tokenbank/activity/BWDInfoActivity.java b/app/src/main/java/com/tokenbank/activity/BWDInfoActivity.java index 04702ba..eb253a5 100755 --- a/app/src/main/java/com/tokenbank/activity/BWDInfoActivity.java +++ b/app/src/main/java/com/tokenbank/activity/BWDInfoActivity.java @@ -66,7 +66,7 @@ public void onClick(View v) { private void initView() { mTitleBar = findViewById(R.id.title_bar); mTitleBar.setTitleTextColor(R.color.white); - mTitleBar.setTitle(getString(R.string.title_backup_wallet)); + mTitleBar.setTitle(getString(R.string.titleBar_backup_wallet)); mTvBakupTitle = findViewById(R.id.tv_bakup_title); mTvBakupContent = findViewById(R.id.tv_bakup_content); @@ -117,13 +117,13 @@ private void updateUIContent() { mScrollViewWords.setVisibility(View.GONE); mTvPk.setVisibility(View.VISIBLE); mTvBakupTitle.setText(getString(R.string.title_backup_private_key)); - mTvBakupContent.setText(getString(R.string.str_backup_content)); + mTvBakupContent.setText(getString(R.string.content_backup_private_kye)); mTvPk.setText(mWalletData.wpk); } else if (mType == WORDS_TYPE) { mScrollViewWords.setVisibility(View.VISIBLE); mTvPk.setVisibility(View.GONE); mTvBakupTitle.setText(getString(R.string.title_backup_mnemonic)); - mTvBakupContent.setText(getString(R.string.str_backup_mnemonic_content)); + mTvBakupContent.setText(getString(R.string.content_backup_mnemonic)); } } diff --git a/app/src/main/java/com/tokenbank/activity/ChangeWalletActivity.java b/app/src/main/java/com/tokenbank/activity/ChangeWalletActivity.java index 5a325f3..656f148 100755 --- a/app/src/main/java/com/tokenbank/activity/ChangeWalletActivity.java +++ b/app/src/main/java/com/tokenbank/activity/ChangeWalletActivity.java @@ -48,7 +48,7 @@ public static void startChangeWalletActivity(Context context) { private void init() { mTitleBar = findViewById(R.id.title_bar); mTitleBar.setLeftDrawable(R.drawable.ic_back); - mTitleBar.setTitle(getString(R.string.title_switch_account)); + mTitleBar.setTitle(getString(R.string.titleBar_switch_account)); mTitleBar.setTitleBarClickListener(new TitleBar.TitleBarListener() { @Override public void onLeftClick(View view) { diff --git a/app/src/main/java/com/tokenbank/activity/ChooseTokenTransferActivity.java b/app/src/main/java/com/tokenbank/activity/ChooseTokenTransferActivity.java index 95aafb2..a69bfe6 100755 --- a/app/src/main/java/com/tokenbank/activity/ChooseTokenTransferActivity.java +++ b/app/src/main/java/com/tokenbank/activity/ChooseTokenTransferActivity.java @@ -61,7 +61,7 @@ private void initView() { mTitleBar = findViewById(R.id.title_bar); mTitleBar.setLeftDrawable(R.drawable.ic_back); - mTitleBar.setTitle(getString(R.string.title_select_token)); + mTitleBar.setTitle(getString(R.string.titleBar_select_token)); mTitleBar.setBackgroundColor(getResources().getColor(R.color.common_blue)); mTitleBar.setTitleBarClickListener(new TitleBar.TitleBarListener() { diff --git a/app/src/main/java/com/tokenbank/activity/ChooseWalletBlockActivity.java b/app/src/main/java/com/tokenbank/activity/ChooseWalletBlockActivity.java index dfc491f..5f1d9c2 100755 --- a/app/src/main/java/com/tokenbank/activity/ChooseWalletBlockActivity.java +++ b/app/src/main/java/com/tokenbank/activity/ChooseWalletBlockActivity.java @@ -34,7 +34,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) { private void initView() { TitleBar mTitleBar = findViewById(R.id.title_bar); - mTitleBar.setTitle(getString(R.string.title_select_block)); + mTitleBar.setTitle(getString(R.string.titleBar_select_block)); mTitleBar.setLeftDrawable(R.drawable.ic_back); mTitleBar.setRightDrawable(R.drawable.ic_walletutil_help); mTitleBar.setTitleBarClickListener(new TitleBar.TitleBarListener() { @@ -64,7 +64,7 @@ public void onItemClick(AdapterView parent, View view, int position, long id) int hid = (int) adapter.getList().get(position).hid; if (hid == -1) { - ToastUtil.toast(ChooseWalletBlockActivity.this, getString(R.string.str_data_exception) + hid); + ToastUtil.toast(ChooseWalletBlockActivity.this, getString(R.string.toast_abnormal_data) + hid); return; } diff --git a/app/src/main/java/com/tokenbank/activity/ConfirmWalletBakupInfoActivity.java b/app/src/main/java/com/tokenbank/activity/ConfirmWalletBakupInfoActivity.java index ec951fe..1ea8073 100755 --- a/app/src/main/java/com/tokenbank/activity/ConfirmWalletBakupInfoActivity.java +++ b/app/src/main/java/com/tokenbank/activity/ConfirmWalletBakupInfoActivity.java @@ -88,7 +88,7 @@ public void onClick(View v) { WalletInfoManager.getInstance().updateWalletBaked(mWalletData.waddress, true); gotoMainActivity(); } else { - ToastUtil.toast(ConfirmWalletBakupInfoActivity.this, getString(R.string.str_private_key_error)); + ToastUtil.toast(ConfirmWalletBakupInfoActivity.this, getString(R.string.toast_private_key_incorrect)); } } else if (mType == WORDS_TYPE) { if (verifyWords()) { @@ -96,7 +96,7 @@ public void onClick(View v) { WalletInfoManager.getInstance().updateWalletBaked(mWalletData.waddress, true); gotoMainActivity(); } else { - ToastUtil.toast(ConfirmWalletBakupInfoActivity.this, getString(R.string.str_mnemonic_error)) + ToastUtil.toast(ConfirmWalletBakupInfoActivity.this, getString(R.string.toast_mnemonic_incorrect)) ; } } @@ -118,7 +118,7 @@ private void resortWords() { private void initView() { mTitleBar = findViewById(R.id.title_bar); - mTitleBar.setTitle(getString(R.string.title_confirm_backup_info)); + mTitleBar.setTitle(getString(R.string.titleBar_verify)); mTitleBar.setTitleBarClickListener(new TitleBar.TitleBarListener() { @Override public void onLeftClick(View view) { @@ -208,13 +208,13 @@ private void updateUIContent() { if (mType == PK_TYPE) { mLayoutWords.setVisibility(View.GONE); mEdtPk.setVisibility(View.VISIBLE); - mTvBakupTitle.setText(getString(R.string.title_confirm_private_key)); - mTvBakupContent.setText(getString(R.string.str_confirm_private_key_tips)); + mTvBakupTitle.setText(getString(R.string.title_verify_private_key)); + mTvBakupContent.setText(getString(R.string.content_verify_private_key)); } else if (mType == WORDS_TYPE) { mLayoutWords.setVisibility(View.VISIBLE); mEdtPk.setVisibility(View.GONE); - mTvBakupTitle.setText(getString(R.string.title_confirm_mnemonic)); - mTvBakupContent.setText(getString(R.string.str_confirm_mnemonic_tips)); + mTvBakupTitle.setText(getString(R.string.title_verify_mnemonic)); + mTvBakupContent.setText(getString(R.string.content_verify_mnemonic)); } } diff --git a/app/src/main/java/com/tokenbank/activity/CreateWalletActivity.java b/app/src/main/java/com/tokenbank/activity/CreateWalletActivity.java index d670488..23c4d52 100755 --- a/app/src/main/java/com/tokenbank/activity/CreateWalletActivity.java +++ b/app/src/main/java/com/tokenbank/activity/CreateWalletActivity.java @@ -6,6 +6,7 @@ import android.content.Intent; import android.os.Bundle; import android.support.annotation.Nullable; +import android.text.Html; import android.text.TextUtils; import android.view.View; import android.widget.Button; @@ -59,7 +60,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) { private void initView() { mTitleBar = findViewById(R.id.title_bar); mTitleBar.setLeftDrawable(R.drawable.ic_back); - mTitleBar.setTitle(R.string.str_create_wallet); + mTitleBar.setTitle(R.string.btn_create_wallet); mTitleBar.setTitleBarClickListener(new TitleBar.TitleBarListener() { @Override public void onLeftClick(View view) { @@ -75,6 +76,7 @@ public void onLeftClick(View view) { mImgServiceTerms = findViewById(R.id.img_service_terms); mImgServiceTerms.setOnClickListener(this); mTvServiceTerms = findViewById(R.id.tv_service_terms); + mTvServiceTerms.setText(Html.fromHtml(getString(R.string.content_read_service))); mTvServiceTerms.setOnClickListener(this); mBtnConfirm = findViewById(R.id.btn_confirm); @@ -157,7 +159,7 @@ public static void navToActivity(Context context, BlockChainData.Block block, in private boolean paramCheck() { if (mBlock == null) { - ViewUtil.showSysAlertDialog(this, getString(R.string.str_choose_currencies), "OK"); + ViewUtil.showSysAlertDialog(this, getString(R.string.dialog_content_no_block), "OK"); return false; } @@ -167,29 +169,29 @@ private boolean paramCheck() { boolean readedTerms = mImgServiceTerms.isSelected(); if (TextUtils.isEmpty(walletName)) { - ViewUtil.showSysAlertDialog(this, getString(R.string.str_no_wallet_name), "OK"); + ViewUtil.showSysAlertDialog(this, getString(R.string.dialog_content_no_wallet_name), "OK"); return false; } if (TextUtils.isEmpty(walletPwd)) { - ViewUtil.showSysAlertDialog(this, getString(R.string.str_no_pwd), "OK"); + ViewUtil.showSysAlertDialog(this, getString(R.string.dialog_content_no_password), "OK"); return false; } if (TextUtils.isEmpty(walletPwdRepeat)) { - ViewUtil.showSysAlertDialog(this, getString(R.string.str_no_verify_pwd), "OK"); + ViewUtil.showSysAlertDialog(this, getString(R.string.dialog_content_no_verify_password), "OK"); return false; } if (!TextUtils.equals(walletPwdRepeat, walletPwd)) { - ViewUtil.showSysAlertDialog(this, getString(R.string.str_verify_pwd_error), "OK"); + ViewUtil.showSysAlertDialog(this, getString(R.string.dialog_content_passwords_unmatch), "OK"); return false; } if (walletPwd.length() < 8) { - ViewUtil.showSysAlertDialog(this, getString(R.string.str_short_pwd), "OK"); + ViewUtil.showSysAlertDialog(this, getString(R.string.dialog_content_short_password), "OK"); return false; } if (!readedTerms) { - ViewUtil.showSysAlertDialog(this, getString(R.string.str_no_read_service), "OK"); + ViewUtil.showSysAlertDialog(this, getString(R.string.dialog_content_no_read_service), "OK"); return false; } @@ -226,7 +228,7 @@ private void recordWallet(final String name, final int walletType, final String final String words, String tips, final String address) { long walletID = System.currentTimeMillis(); storeWallet(walletID, walletType, name, address, hash, privateKey, words); - ToastUtil.toast(CreateWalletActivity.this, getString(R.string.str_wallet_created)); + ToastUtil.toast(CreateWalletActivity.this, getString(R.string.toast_wallet_created)); gotoBakup(); } @@ -244,12 +246,12 @@ private void storeWallet(long walletId, int walletType, String walletName, Strin private void resetBtn() { - mBtnConfirm.setText(getString(R.string.str_create_wallet)); + mBtnConfirm.setText(getString(R.string.btn_create_wallet_done)); mBtnConfirm.setEnabled(true); } private void setBtnStateToCreating() { - mBtnConfirm.setText(getString(R.string.str_creating_wallet)); + mBtnConfirm.setText(getString(R.string.btn_creating_wallet)); mBtnConfirm.setEnabled(false); } @@ -265,6 +267,6 @@ private void gotoBakup() { } private void gotoServiceTermPage() { - WebBrowserActivity.startWebBrowserActivity(this, getString(R.string.title_service_terms), Constant.service_term_url); + WebBrowserActivity.startWebBrowserActivity(this, getString(R.string.titleBar_service_terms), Constant.service_term_url); } } diff --git a/app/src/main/java/com/tokenbank/activity/ImportWalletActivity.java b/app/src/main/java/com/tokenbank/activity/ImportWalletActivity.java index f48dd45..77e275d 100755 --- a/app/src/main/java/com/tokenbank/activity/ImportWalletActivity.java +++ b/app/src/main/java/com/tokenbank/activity/ImportWalletActivity.java @@ -89,7 +89,7 @@ private void initView() { mTitleBar = findViewById(R.id.title_bar); mTitleBar.setLeftDrawable(R.drawable.ic_back); - mTitleBar.setTitle(getString(R.string.title_import_wallet)); + mTitleBar.setTitle(getString(R.string.titleBar_import_wallet)); mTitleBar.setTitleBarClickListener(new TitleBar.TitleBarListener() { @Override public void onLeftClick(View view) { diff --git a/app/src/main/java/com/tokenbank/activity/ManageWalletActivity.java b/app/src/main/java/com/tokenbank/activity/ManageWalletActivity.java index 65f09aa..5c85d41 100755 --- a/app/src/main/java/com/tokenbank/activity/ManageWalletActivity.java +++ b/app/src/main/java/com/tokenbank/activity/ManageWalletActivity.java @@ -54,7 +54,7 @@ private void initView() { mTitleBar = (TitleBar) findViewById(R.id.title_bar); mTitleBar.setLeftDrawable(R.drawable.ic_back); - mTitleBar.setTitle(getString(R.string.title_manage_wallet)); + mTitleBar.setTitle(getString(R.string.titleBar_manage_wallet)); mTitleBar.setTitleTextColor(R.color.white); mTitleBar.setBackgroundColor(getResources().getColor(R.color.common_blue)); mTitleBar.setTitleBarClickListener(this); diff --git a/app/src/main/java/com/tokenbank/activity/ModifyPwdActivity.java b/app/src/main/java/com/tokenbank/activity/ModifyPwdActivity.java index d9509cf..a21fa12 100755 --- a/app/src/main/java/com/tokenbank/activity/ModifyPwdActivity.java +++ b/app/src/main/java/com/tokenbank/activity/ModifyPwdActivity.java @@ -56,37 +56,37 @@ public void onLeftClick(View view) { @Override public void onRightClick(View view) { if (TextUtils.isEmpty(mEdtOldPwd.getText().toString())) { - showTipAlertDialog(getString(R.string.str_no_old_pwd)); + showTipAlertDialog(getString(R.string.dialog_content_no_old_password)); return; } if (TextUtils.isEmpty(mEdtNewPwd.getText().toString())) { - showTipAlertDialog(getString(R.string.str_no_new_pwd)); + showTipAlertDialog(getString(R.string.dialog_content_no_new_password)); return; } if (TextUtils.isEmpty(mEdtReaptNewPwd.getText().toString())) { - showTipAlertDialog(getString(R.string.str_no_verify_new_pwd)); + showTipAlertDialog(getString(R.string.dialog_content_no_verify_new_password)); return; } if (!TextUtils.equals(mEdtReaptNewPwd.getText().toString(), mEdtNewPwd.getText().toString())) { - showTipAlertDialog(getString(R.string.str_verify_new_pwd_error)); + showTipAlertDialog(getString(R.string.dialog_new_passwords_unmatch)); return; } if (mEdtNewPwd.getText().toString().length() < 8) { - showTipAlertDialog(getString(R.string.str_short_pwd)); + showTipAlertDialog(getString(R.string.dialog_content_short_password)); return; } if (TextUtils.equals(mEdtNewPwd.getText().toString(), mEdtOldPwd.getText().toString())) { - showTipAlertDialog(getString(R.string.str_reset_pwd)); + showTipAlertDialog(getString(R.string.dialog_content_old_new_same)); return; } String oldHash = FileUtil.getStringContent(mEdtOldPwd.getText().toString()); if (!TextUtils.equals(oldHash, mWalletData.whash)) { - showTipAlertDialog(getString(R.string.str_old_pwd_error)); + showTipAlertDialog(getString(R.string.dialog_content_old_password_incorrect)); mEdtOldPwd.setText(""); return; } - ToastUtil.toast(ModifyPwdActivity.this, getString(R.string.str_pwd_changed)); + ToastUtil.toast(ModifyPwdActivity.this, getString(R.string.toast_password_changed)); WalletInfoManager.getInstance().updateWalletHash(mWalletData.waddress, FileUtil.getStringContent(mEdtNewPwd.getText().toString())); this.finish(); } @@ -115,9 +115,9 @@ private void initView() { mTitleBar = (TitleBar) findViewById(R.id.title_bar); mTitleBar.setLeftDrawable(R.drawable.ic_back); - mTitleBar.setTitle(getString(R.string.title_change_pwd)); + mTitleBar.setTitle(getString(R.string.titleBar_change_pwd)); - mTitleBar.setRightText(getString(R.string.str_completed)); + mTitleBar.setRightText(getString(R.string.titleBar_completed)); mTitleBar.setRightTextColor(R.color.white); mTitleBar.setTitleBarClickListener(this); @@ -125,7 +125,7 @@ private void initView() { mEdtNewPwd = findViewById(R.id.edt_new_pwd); mEdtReaptNewPwd = findViewById(R.id.edt_new_repeat_pwd); mTvForgetPwdTips = findViewById(R.id.tv_forgetpwd_tip); - mTvForgetPwdTips.setText(Html.fromHtml(getString(R.string.str_forget_pwd_tips))); + mTvForgetPwdTips.setText(Html.fromHtml(getString(R.string.content_forgot_password))); mTvForgetPwdTips.setOnClickListener(this); } diff --git a/app/src/main/java/com/tokenbank/activity/ModifyWalletActivity.java b/app/src/main/java/com/tokenbank/activity/ModifyWalletActivity.java index d500db6..93900f9 100755 --- a/app/src/main/java/com/tokenbank/activity/ModifyWalletActivity.java +++ b/app/src/main/java/com/tokenbank/activity/ModifyWalletActivity.java @@ -75,7 +75,7 @@ public void onClick(View view) { gotoBak(); } else if (view == mTvWalletAddress) { Util.clipboard(ModifyWalletActivity.this, "", mTvWalletAddress.getText().toString()); - ToastUtil.toast(ModifyWalletActivity.this, getString(R.string.str_wallet_address_copy)); + ToastUtil.toast(ModifyWalletActivity.this, getString(R.string.toast_wallet_address_copied)); } } @@ -100,13 +100,13 @@ public void authPwd(String tag, boolean result) { if (result) { realExportPrivateKey(); } else { - ToastUtil.toast(this, getString(R.string.str_pwd_error)); + ToastUtil.toast(this, getString(R.string.toast_password_incorrect)); } } else if (TextUtils.equals(tag, "deletewallet")) { if (result) { deleteWallet(); } else { - ToastUtil.toast(this, getString(R.string.str_pwd_error)); + ToastUtil.toast(this, getString(R.string.toast_password_incorrect)); } } } @@ -122,7 +122,7 @@ private void initView() { mTitleBar = (TitleBar) findViewById(R.id.title_bar); mTitleBar.setLeftDrawable(R.drawable.ic_back); mTitleBar.setTitle(mWalletData.wname); - mTitleBar.setRightText(getString(R.string.str_save)); + mTitleBar.setRightText(getString(R.string.titleBar_save)); mTitleBar.setRightTextColor(R.color.white); mTitleBar.setTitleBarClickListener(this); @@ -172,7 +172,7 @@ private void realExportPrivateKey() { private void saveWalletInfo() { String newWalletName = mEdtWalletName.getText().toString(); if (TextUtils.isEmpty(newWalletName)) { - ViewUtil.showSysAlertDialog(this, getString(R.string.str_no_wallet_name), "Ok"); + ViewUtil.showSysAlertDialog(this, getString(R.string.dialog_content_no_wallet_name), "Ok"); return; } mWalletData.wname = newWalletName; @@ -183,13 +183,13 @@ private void saveWalletInfo() { private void deleteWallet() { if (!mWalletData.isBaked) { if (mWalletData.type == 1) { - ViewUtil.showSysAlertDialog(ModifyWalletActivity.this, getString(R.string.str_warning), getString(R.string.str_no_wallet_backup_tips), getString(R.string.str_backup), new DialogInterface.OnClickListener() { + ViewUtil.showSysAlertDialog(ModifyWalletActivity.this, getString(R.string.dialog_title_warning), getString(R.string.dialog_content_no_wallet_backup), getString(R.string.dialog_btn_backup), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { gotoBak(); dialog.dismiss(); } - }, getString(R.string.str_continue_delete), new DialogInterface.OnClickListener() { + }, getString(R.string.dialog_btn_delete), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { WalletInfoManager.getInstance().deleteWallet(ModifyWalletActivity.this, mWalletData); @@ -198,13 +198,13 @@ public void onClick(DialogInterface dialog, int which) { } }); } else if (mWalletData.type == 2) { - ViewUtil.showSysAlertDialog(ModifyWalletActivity.this, getString(R.string.str_warning), getString(R.string.str_no_key_backup_tips), getString(R.string.str_backup), new DialogInterface.OnClickListener() { + ViewUtil.showSysAlertDialog(ModifyWalletActivity.this, getString(R.string.dialog_title_warning), getString(R.string.dialog_content_no_key_backup), getString(R.string.dialog_btn_backup), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { verifyPwd("exportprivatekey"); dialog.dismiss(); } - }, getString(R.string.str_continue_delete), new DialogInterface.OnClickListener() { + }, getString(R.string.dialog_btn_delete), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { WalletInfoManager.getInstance().deleteWallet(ModifyWalletActivity.this, mWalletData); @@ -223,7 +223,7 @@ private void gotoBak() { String[] words = null; words = mWalletData.words.split(" "); if (words == null || words.length < 12) { - ToastUtil.toast(ModifyWalletActivity.this, getString(R.string.str_cant_backup)); + ToastUtil.toast(ModifyWalletActivity.this, getString(R.string.toast_cant_backup)); return; } StartBakupActivity.startBakupWalletStartActivity(ModifyWalletActivity.this, mWalletData.waddress, 2); diff --git a/app/src/main/java/com/tokenbank/activity/SplashActivity.java b/app/src/main/java/com/tokenbank/activity/SplashActivity.java index 11a5c4a..66d9c08 100755 --- a/app/src/main/java/com/tokenbank/activity/SplashActivity.java +++ b/app/src/main/java/com/tokenbank/activity/SplashActivity.java @@ -42,7 +42,7 @@ protected void onCreate(Bundle savedInstanceState) { mTvImportWallet = (TextView) findViewById(R.id.tv_import_wallet); mTvImportWallet.setOnClickListener(this); if (!NetUtil.isNetworkAvailable(this)) { - ToastUtil.toast(this, getString(R.string.str_no_network)); + ToastUtil.toast(this, getString(R.string.toast_no_network)); } // checkUpgrade(); checkPermission(); diff --git a/app/src/main/java/com/tokenbank/activity/StartBakupActivity.java b/app/src/main/java/com/tokenbank/activity/StartBakupActivity.java index 749d638..a3d6d07 100755 --- a/app/src/main/java/com/tokenbank/activity/StartBakupActivity.java +++ b/app/src/main/java/com/tokenbank/activity/StartBakupActivity.java @@ -87,7 +87,7 @@ private boolean verifyData() { private void initView() { mTitleBar = findViewById(R.id.title_bar); - mTitleBar.setTitle(getString(R.string.title_backup_wallet)); + mTitleBar.setTitle(getString(R.string.titleBar_backup_wallet)); mTvBakupTitle = findViewById(R.id.tv_bakup_title); mTvBakupContent = findViewById(R.id.tv_bakup_content); @@ -100,10 +100,10 @@ private void initView() { private void updateUIContent() { if (mType == PK_TYPE) { mTvBakupTitle.setText(getString(R.string.title_backup_private_key)); - mTvBakupContent.setText(getString(R.string.str_backup_content)); + mTvBakupContent.setText(getString(R.string.content_backup_private_kye)); } else if (mType == WORDS_TYPE) { mTvBakupTitle.setText(getString(R.string.title_backup_mnemonic)); - mTvBakupContent.setText(getString(R.string.str_backup_mnemonic_content)); + mTvBakupContent.setText(getString(R.string.content_backup_mnemonic)); } } } diff --git a/app/src/main/java/com/tokenbank/activity/TokenReceiveActivity.java b/app/src/main/java/com/tokenbank/activity/TokenReceiveActivity.java index d9b3ffd..eaab94e 100755 --- a/app/src/main/java/com/tokenbank/activity/TokenReceiveActivity.java +++ b/app/src/main/java/com/tokenbank/activity/TokenReceiveActivity.java @@ -66,7 +66,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) { private void initView() { mTitleBar = findViewById(R.id.title_bar); mTitleBar.setLeftDrawable(R.drawable.ic_back); - mTitleBar.setTitle(getString(R.string.title_receivables)); + mTitleBar.setTitle(getString(R.string.titleBar_collect)); mTitleBar.setTitleBarClickListener(new TitleBar.TitleBarListener() { @Override public void onLeftClick(View view) { @@ -86,7 +86,7 @@ public void onLeftClick(View view) { @Override public void onClick(View v) { Util.clipboard(TokenReceiveActivity.this, "", mTvAddress.getText().toString()); - ToastUtil.toast(TokenReceiveActivity.this, getString(R.string.str_wallet_address_copy)); + ToastUtil.toast(TokenReceiveActivity.this, getString(R.string.toast_wallet_address_copied)); } }); } @@ -110,7 +110,7 @@ public void afterTextChanged(Editable editable) { double amount = Util.parseDouble(mEdtAmount.getText().toString()); double tokenAmount = 0.0f; if (amount < 0) { - ToastUtil.toast(TokenReceiveActivity.this, getString(R.string.str_enter_correct_number)); + ToastUtil.toast(TokenReceiveActivity.this, getString(R.string.toast_enter_amount)); } else { tokenAmount = amount; } @@ -125,7 +125,7 @@ public void afterTextChanged(Editable editable) { private void generateAddress(String walletAddress, double amount, String token) { if (TextUtils.isEmpty(walletAddress) || amount < 0.0f || TextUtils.isEmpty(token)) { - ToastUtil.toast(TokenReceiveActivity.this, getString(R.string.str_payment_code_error)); + ToastUtil.toast(TokenReceiveActivity.this, getString(R.string.toast_collect_code_err)); mImgQrShadow.setVisibility(View.VISIBLE); return; } @@ -139,7 +139,7 @@ public void onGetWResult(int ret, GsonUtil extra) { createQRCode(receiveAddress); } } else { - ToastUtil.toast(TokenReceiveActivity.this, getString(R.string.str_payment_code_error)); + ToastUtil.toast(TokenReceiveActivity.this, getString(R.string.toast_collect_code_err)); mImgQrShadow.setVisibility(View.VISIBLE); } } diff --git a/app/src/main/java/com/tokenbank/activity/TokenTransferActivity.java b/app/src/main/java/com/tokenbank/activity/TokenTransferActivity.java index 828f517..c28a935 100755 --- a/app/src/main/java/com/tokenbank/activity/TokenTransferActivity.java +++ b/app/src/main/java/com/tokenbank/activity/TokenTransferActivity.java @@ -86,7 +86,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) { private void initView() { mTitleBar = findViewById(R.id.title_bar); mTitleBar.setLeftDrawable(R.drawable.ic_back); - mTitleBar.setTitle(getString(R.string.title_transfer)); + mTitleBar.setTitle(getString(R.string.titleBar_transfer)); // mTitleBar.setTitleBarClickListener(new TitleBar.TitleBarListener()); mTitleBar.setTitleBarClickListener(new TitleBar.TitleBarListener() { @Override @@ -192,7 +192,7 @@ public void authPwd(String tag, boolean result) { if (result) { pwdRight(); } else { - ToastUtil.toast(TokenTransferActivity.this, getString(R.string.str_order_pwd_error)); + ToastUtil.toast(TokenTransferActivity.this, getString(R.string.toast_order_password_incorrect)); } } } @@ -215,7 +215,7 @@ public void onRequesResult(int ret, GsonUtil json) { if (ret == 0) { long sequence = json.getLong("sequence", 0); if (sequence <= 0) { - ToastUtil.toast(TokenTransferActivity.this, getString(R.string.str_transfer_failed) + 1002); + ToastUtil.toast(TokenTransferActivity.this, getString(R.string.toast_transfer_failed) + 1002); } else { GsonUtil dataList = json.getArray("balances", "[]"); int len = dataList.getLength(); @@ -227,7 +227,7 @@ public void onRequesResult(int ret, GsonUtil json) { double value = item.getDouble("value", 0.0f); if (value < mAmount) { resetTranferBtn(); - ToastUtil.toast(TokenTransferActivity.this, getString(R.string.str_insufficient_balance) + 1003); + ToastUtil.toast(TokenTransferActivity.this, getString(R.string.toast_insufficient_balance) + 1003); return; } signedSwtTransaction(mGas, sequence, mWalletData.waddress, @@ -239,7 +239,7 @@ public void onRequesResult(int ret, GsonUtil json) { } else { resetTranferBtn(); - ToastUtil.toast(TokenTransferActivity.this, getString(R.string.str_transfer_failed) + 1001); + ToastUtil.toast(TokenTransferActivity.this, getString(R.string.toast_transfer_failed) + 1001); } } }); @@ -265,7 +265,7 @@ public void onGetWResult(int ret, GsonUtil extra) { sendSignedTransaction(rawTransaction); } else { resetTranferBtn(); - ToastUtil.toast(TokenTransferActivity.this, getString(R.string.str_transfer_failed) + 6); + ToastUtil.toast(TokenTransferActivity.this, getString(R.string.toast_transfer_failed) + 6); } } }); @@ -275,7 +275,7 @@ public void onGetWResult(int ret, GsonUtil extra) { private void sendSignedTransaction(String rawTransaction) { if (TextUtils.isEmpty(rawTransaction)) { resetTranferBtn(); - ToastUtil.toast(TokenTransferActivity.this, getString(R.string.str_transfer_failed) + 3); + ToastUtil.toast(TokenTransferActivity.this, getString(R.string.toast_transfer_failed) + 3); return; } mWalletUtil.sendSignedTransaction(rawTransaction, new WCallback() { @@ -283,11 +283,11 @@ private void sendSignedTransaction(String rawTransaction) { public void onGetWResult(int ret, GsonUtil extra) { if (ret == 0) { resetTranferBtn(); - ToastUtil.toast(TokenTransferActivity.this, getString(R.string.str_transfer_successful)); + ToastUtil.toast(TokenTransferActivity.this, getString(R.string.toast_transfer_success)); TokenTransferActivity.this.finish(); } else { resetTranferBtn(); - ToastUtil.toast(TokenTransferActivity.this, getString(R.string.str_transfer_failed) + 4); + ToastUtil.toast(TokenTransferActivity.this, getString(R.string.toast_transfer_failed) + 4); } } }); @@ -299,27 +299,27 @@ private boolean paramCheck() { String num = mEdtTransferNum.getText().toString(); if (TextUtils.isEmpty(mTvToken.getText().toString())) { - ViewUtil.showSysAlertDialog(this, getString(R.string.str_choose_token), "OK"); + ViewUtil.showSysAlertDialog(this, getString(R.string.dialog_content_choose_token), "OK"); return false; } if (TextUtils.isEmpty(address)) { - ViewUtil.showSysAlertDialog(this, getString(R.string.str_enter_wallet_address), "OK"); + ViewUtil.showSysAlertDialog(this, getString(R.string.dialog_content_no_wallet_address), "OK"); return false; } if (TextUtils.equals(address, mWalletData.waddress)) { - ViewUtil.showSysAlertDialog(this, getString(R.string.str_payment_address_error), "OK"); + ViewUtil.showSysAlertDialog(this, getString(R.string.dialog_content_receive_address_incorrect), "OK"); return false; } if (!mWalletUtil.checkWalletAddress(address)) { - ViewUtil.showSysAlertDialog(this, getString(R.string.str_wallet_address_format_error), "OK"); + ViewUtil.showSysAlertDialog(this, getString(R.string.dialog_content_address_format_incorrect), "OK"); return false; } if ((TextUtils.isEmpty(num) || Util.parseDouble(num) <= 0.0f)) { - ViewUtil.showSysAlertDialog(this, getString(R.string.str_transfer_number_error), "OK"); + ViewUtil.showSysAlertDialog(this, getString(R.string.dialog_content_amount_incorrect), "OK"); return false; } return true; @@ -327,12 +327,12 @@ private boolean paramCheck() { private void updateBtnToTranferingState() { mBtnNext.setEnabled(false); - mBtnNext.setText(getString(R.string.str_transferring)); + mBtnNext.setText(getString(R.string.btn_transferring)); } private void resetTranferBtn() { mBtnNext.setEnabled(true); - mBtnNext.setText(getString(R.string.str_next)); + mBtnNext.setText(getString(R.string.btn_next)); } /** diff --git a/app/src/main/java/com/tokenbank/activity/TransactionDetailsActivity.java b/app/src/main/java/com/tokenbank/activity/TransactionDetailsActivity.java index fbc9d9f..e648b48 100755 --- a/app/src/main/java/com/tokenbank/activity/TransactionDetailsActivity.java +++ b/app/src/main/java/com/tokenbank/activity/TransactionDetailsActivity.java @@ -53,7 +53,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) { } mHash = transactionData.getString("hash", ""); if (TextUtils.isEmpty(mHash)) { - ToastUtil.toast(TransactionDetailsActivity.this, getString(R.string.str_illegal_parameters)); + ToastUtil.toast(TransactionDetailsActivity.this, getString(R.string.toast_illegal_parameters)); this.finish(); return; } @@ -71,7 +71,7 @@ private void initView() { mTitleBar = findViewById(R.id.title_bar); mTitleBar.setLeftDrawable(R.drawable.ic_back); - mTitleBar.setTitle(getString(R.string.title_transaction_details)); + mTitleBar.setTitle(getString(R.string.titleBar_transaction_details)); mTitleBar.setTitleBarClickListener(new TitleBar.TitleBarListener() { @Override public void onLeftClick(View view) { @@ -117,15 +117,15 @@ private void updateData(GsonUtil transactionInfo) { int status = transactionInfo.getInt("txreceipt_status", 5); if (status == 1) { //success - mTvTransactionStatus.setText(getString(R.string.str_trading_success)); + mTvTransactionStatus.setText(getString(R.string.content_trading_success)); } else if (status == 2) { //pending - mTvTransactionStatus.setText(getString(R.string.str_trading_packing)); + mTvTransactionStatus.setText(getString(R.string.content_trading_pending)); } else if (status == 0) { //fail - mTvTransactionStatus.setText(getString(R.string.str_transaction_failed)); + mTvTransactionStatus.setText(getString(R.string.content_trading_failure)); } else { - mTvTransactionStatus.setText(getString(R.string.str_unknown_status_tips)); + mTvTransactionStatus.setText(getString(R.string.content_trading_unknown)); } mTvCount.setText(value + ""); mTvSymbol.setText(transactionInfo.getString("tokenSymbol", "")); @@ -139,7 +139,7 @@ public void onGetWResult(int ret, GsonUtil extra) { if (ret == 0) { updateData(extra.getObject("data", "{}")); } else { - ToastUtil.toast(TransactionDetailsActivity.this, getString(R.string.str_get_transaction_info_failed)) + ToastUtil.toast(TransactionDetailsActivity.this, getString(R.string.toast_transaction_info_failure)) ; TransactionDetailsActivity.this.finish(); } @@ -168,17 +168,17 @@ public void onClick(View v) { if (v == mTvCopyUrl) { Util.clipboard(TransactionDetailsActivity.this, "", mWalletUtil.getTransactionSearchUrl(mTvTransactionId.getText().toString())); - ToastUtil.toast(TransactionDetailsActivity.this, getString(R.string.str_url_copy)); + ToastUtil.toast(TransactionDetailsActivity.this, getString(R.string.toast_url_copied)); } else if (v == mTvSender) { Util.clipboard(TransactionDetailsActivity.this, "", mTvSender.getText().toString()); - ToastUtil.toast(TransactionDetailsActivity.this, getString(R.string.str_send_address_copy)) + ToastUtil.toast(TransactionDetailsActivity.this, getString(R.string.toast_send_address_copied)) ; } else if (v == mTvReceiver) { Util.clipboard(TransactionDetailsActivity.this, "", mTvReceiver.getText().toString()); - ToastUtil.toast(TransactionDetailsActivity.this, getString(R.string.str_payment_address_copy)) + ToastUtil.toast(TransactionDetailsActivity.this, getString(R.string.toast_receive_address_copied)) ; } else if (v == mTvTransactionId) { - WebBrowserActivity.startWebBrowserActivity(TransactionDetailsActivity.this, getString(R.string.title_transaction_inquiry), + WebBrowserActivity.startWebBrowserActivity(TransactionDetailsActivity.this, getString(R.string.titleBar_transaction_query), mWalletUtil.getTransactionSearchUrl(mTvTransactionId.getText().toString())); } } diff --git a/app/src/main/java/com/tokenbank/activity/TransactionRecordActivity.java b/app/src/main/java/com/tokenbank/activity/TransactionRecordActivity.java index 8b363e0..e249eaa 100755 --- a/app/src/main/java/com/tokenbank/activity/TransactionRecordActivity.java +++ b/app/src/main/java/com/tokenbank/activity/TransactionRecordActivity.java @@ -67,7 +67,7 @@ protected void onResume() { mSwipeRefreshLayout.setRefreshing(true); } if (mFrom == 1) { - mTitleBar.setTitle(getString(R.string.title_message_center)); + mTitleBar.setTitle(getString(R.string.titleBar_message_center)); } else { mTitleBar.setTitle(WalletInfoManager.getInstance().getWname()); diff --git a/app/src/main/java/com/tokenbank/base/WalletInfoManager.java b/app/src/main/java/com/tokenbank/base/WalletInfoManager.java index 5b6dbff..6a3904c 100755 --- a/app/src/main/java/com/tokenbank/base/WalletInfoManager.java +++ b/app/src/main/java/com/tokenbank/base/WalletInfoManager.java @@ -402,7 +402,7 @@ private void updateWalletDefaultSp(WData wallet) { TextUtils.isEmpty(wallet.wpk) || wallet.wid <= 0 || wallet.type <= 0) { - ToastUtil.toast(AppConfig.getContext(), AppConfig.getContext().getString(R.string.str_update_default_wallet_failed)); + ToastUtil.toast(AppConfig.getContext(), AppConfig.getContext().getString(R.string.toast_update_default_wallet_failed)); return; } FileUtil.putIntToSp(AppConfig.getContext(), Constant.wallet_def_file, Constant.wtype, wallet.type); diff --git a/app/src/main/java/com/tokenbank/dialog/PKDialog.java b/app/src/main/java/com/tokenbank/dialog/PKDialog.java index 6d36707..bbc4c56 100755 --- a/app/src/main/java/com/tokenbank/dialog/PKDialog.java +++ b/app/src/main/java/com/tokenbank/dialog/PKDialog.java @@ -60,6 +60,6 @@ private void initView() { private void copyPrivateKey() { Util.clipboard(getContext(), "", mTvPrivateKey.getText().toString()); - ToastUtil.toast(getContext(), getContext().getString(R.string.str_private_key_copy)); + ToastUtil.toast(getContext(), getContext().getString(R.string.toast_private_key_copied)); } } diff --git a/app/src/main/java/com/tokenbank/fragment/MainUserFragment.java b/app/src/main/java/com/tokenbank/fragment/MainUserFragment.java index 2494b11..0d3483c 100755 --- a/app/src/main/java/com/tokenbank/fragment/MainUserFragment.java +++ b/app/src/main/java/com/tokenbank/fragment/MainUserFragment.java @@ -52,7 +52,7 @@ public void onClick(View view) { } else if (view == mLayoutNotifcation) { TransactionRecordActivity.startTransactionRecordActivity(getActivity(), 1); } else if (view == mLayoutHelp) { - WebBrowserActivity.startWebBrowserActivity(getActivity(), getString(R.string.title_help_center), Constant.help_url); + WebBrowserActivity.startWebBrowserActivity(getActivity(), getString(R.string.titleBar_help_center), Constant.help_url); } else if (view == mLayoutAbout) { AboutActivity.startAboutActivity(getActivity()); } diff --git a/app/src/main/java/com/tokenbank/fragment/MainWalletFragment.java b/app/src/main/java/com/tokenbank/fragment/MainWalletFragment.java index 704a10c..c65859e 100755 --- a/app/src/main/java/com/tokenbank/fragment/MainWalletFragment.java +++ b/app/src/main/java/com/tokenbank/fragment/MainWalletFragment.java @@ -151,7 +151,7 @@ public void onResume() { @Override public void onClick(View view) { if (!NetUtil.isNetworkAvailable(getActivity())) { - ToastUtil.toast(getContext(), getString(R.string.str_no_network)); + ToastUtil.toast(getContext(), getString(R.string.toast_no_network)); return; } switch (view.getId()) { @@ -183,16 +183,16 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) { //扫描到地址 String scanResult = data.getStringExtra("result"); if (TextUtils.isEmpty(scanResult)) { - ToastUtil.toast(getContext(), getString(R.string.str_scan_error)); + ToastUtil.toast(getContext(), getString(R.string.toast_scan_failure)); } else { if (scanResult.startsWith("iban")) { //eth - ToastUtil.toast(getContext(), getString(R.string.str_not_support_eth_wallet)); + ToastUtil.toast(getContext(), getString(R.string.toast_not_support_eth_wallet)); } else if (scanResult.startsWith("jingtum")) { //swt handleSwtScanResult(scanResult); } else { - ToastUtil.toast(getContext(), getString(R.string.str_scan_error)); + ToastUtil.toast(getContext(), getString(R.string.toast_scan_failure)); } } } @@ -202,7 +202,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) { private void handleSwtScanResult(final String scanResult) { if (!WalletInfoManager.getInstance().hasWallet(TBController.SWT_INDEX)) { - ToastUtil.toast(getContext(), getString(R.string.str_no_jintum_wallet_tips)); + ToastUtil.toast(getContext(), getString(R.string.toast_no_jintum_wallet)); return; } if (WalletInfoManager.getInstance().getWalletType() == TBController.SWT_INDEX) { @@ -214,13 +214,13 @@ private void handleSwtScanResult(final String scanResult) { TokenTransferActivity.startTokenTransferActivity(getContext(), ibanAddress, "", num, token, 0, 0); } else { - ViewUtil.showSysAlertDialog(getContext(), getString(R.string.str_prompt), getString(R.string.str_switch_jintum_wallet_tips), - getString(R.string.str_dont_switch), new DialogInterface.OnClickListener() { + ViewUtil.showSysAlertDialog(getContext(), getString(R.string.dialog_title_reminder), getString(R.string.dialog_content_switch_jintum_wallet), + getString(R.string.dialog_btn_not_switch), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); } - }, getString(R.string.str_switch), new DialogInterface.OnClickListener() { + }, getString(R.string.dialog_btn_switch), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { if (WalletInfoManager.getInstance().setCurrentWallet(TBController.SWT_INDEX)) { @@ -313,7 +313,7 @@ public void onDataLoadingFinish(K params, boolean end, boolean loadmore) { } private void update() { - mTvWalletUnit.setText(String.format(getString(R.string.str_my_assets))); + mTvWalletUnit.setText(String.format(getString(R.string.content_my_asset))); setWalletName(); } diff --git a/app/src/main/java/com/tokenbank/fragment/PKFragment.java b/app/src/main/java/com/tokenbank/fragment/PKFragment.java index a36f825..b58d7f8 100755 --- a/app/src/main/java/com/tokenbank/fragment/PKFragment.java +++ b/app/src/main/java/com/tokenbank/fragment/PKFragment.java @@ -119,7 +119,7 @@ private void initView(View view) { mImgboxTerms.setOnClickListener(this); mTvTerms = view.findViewById(R.id.tv_service_terms); - mTvTerms.setText(Html.fromHtml(getString(R.string.str_has_read_services))); + mTvTerms.setText(Html.fromHtml(getString(R.string.content_read_service))); mTvTerms.setOnClickListener(this); mTvImportWallet = view.findViewById(R.id.tv_import_wallet); @@ -137,7 +137,7 @@ private void checkPrivateKey() { } private void gotoServiceTermPage() { - WebBrowserActivity.startWebBrowserActivity(getActivity(), getString(R.string.title_user_agreement), Constant.service_term_url); + WebBrowserActivity.startWebBrowserActivity(getActivity(), getString(R.string.titleBar_user_agreement), Constant.service_term_url); } private boolean paramCheck() { @@ -147,38 +147,38 @@ private boolean paramCheck() { String walletName = mEdtWalletName.getText().toString(); boolean readedTerms = mImgboxTerms.isSelected(); if (TextUtils.isEmpty(walletName)) { - ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.str_input_wallet_name), "OK"); + ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.enter_hint_wallet_name), "OK"); return false; } if (TextUtils.isEmpty(walletPrivateKey)) { - ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.str_no_private_key), "OK"); + ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.dialog_title_no_private_key), "OK"); return false; } if (!walletblockchain.checkWalletPk(walletPrivateKey)) { - ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.str_private_key_format_error), "OK"); + ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.dialog_title_key_format_incorrect), "OK"); return false; } if (TextUtils.isEmpty(walletPwd)) { - ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.str_no_pwd), "OK"); + ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.dialog_content_no_password), "OK"); return false; } if (TextUtils.isEmpty(walletPwdRepeat)) { - ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.str_no_verify_pwd), "OK"); + ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.dialog_content_no_verify_password), "OK"); return false; } if (!TextUtils.equals(walletPwdRepeat, walletPwd)) { - ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.str_verify_pwd_error), "OK"); + ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.dialog_content_passwords_unmatch), "OK"); return false; } if (walletPwd.length() < 8) { - ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.str_short_pwd), "OK"); + ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.dialog_content_short_password), "OK"); return false; } if (!readedTerms) { - ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.str_no_read_service), "OK"); + ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.dialog_content_no_read_service), "OK"); return false; } return true; @@ -195,7 +195,7 @@ public void onGetWResult(int ret, GsonUtil extra) { if (isWalletExsit(address)) { if (flag == 1) { //导入钱包 - ToastUtil.toast(getActivity(), getString(R.string.str_wallet_exists)); + ToastUtil.toast(getActivity(), getString(R.string.toast_wallet_exists)); return; } else if (flag == 2) { //重置密码 @@ -207,7 +207,7 @@ public void onGetWResult(int ret, GsonUtil extra) { uploadWallet(mEdtWalletName.getText().toString(), extra.getInt("blockType", -1), FileUtil.getStringContent(password), privateKey, address); } else { - ToastUtil.toast(getActivity(), getString(R.string.str_import_wallet_failed)); + ToastUtil.toast(getActivity(), getString(R.string.toast_import_wallet_failed)); } } }); @@ -241,7 +241,7 @@ private void storeWallet(long walletId, int walletType, String walletName, Strin } private void gotoPrivateKeyIntroPage() { - WebBrowserActivity.startWebBrowserActivity(getActivity(), getString(R.string.title_private_key), Constant.privatekey_intro_url); + WebBrowserActivity.startWebBrowserActivity(getActivity(), getString(R.string.titleBar_private_key), Constant.privatekey_intro_url); } private boolean isWalletExsit(String address) { diff --git a/app/src/main/java/com/tokenbank/fragment/WordsFragment.java b/app/src/main/java/com/tokenbank/fragment/WordsFragment.java index d010abb..a1578a3 100755 --- a/app/src/main/java/com/tokenbank/fragment/WordsFragment.java +++ b/app/src/main/java/com/tokenbank/fragment/WordsFragment.java @@ -117,7 +117,7 @@ private void initView(View view) { mImgboxTerms.setOnClickListener(this); mTvTerms = view.findViewById(R.id.tv_service_terms); - mTvTerms.setText(Html.fromHtml(getString(R.string.str_has_read_services))); + mTvTerms.setText(Html.fromHtml(getString(R.string.content_read_service))); mTvTerms.setOnClickListener(this); mTvImportWallet = view.findViewById(R.id.tv_import_wallet); @@ -129,7 +129,7 @@ private void initView(View view) { } private void gotoServiceTermPage() { - WebBrowserActivity.startWebBrowserActivity(getActivity(), getString(R.string.title_user_agreement), Constant.service_term_url); + WebBrowserActivity.startWebBrowserActivity(getActivity(), getString(R.string.titleBar_user_agreement), Constant.service_term_url); } private boolean paramCheck() { @@ -139,33 +139,33 @@ private boolean paramCheck() { String walletName = mEdtWalletName.getText().toString(); boolean readedTerms = mImgboxTerms.isSelected(); if (TextUtils.isEmpty(walletName)) { - ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.str_input_wallet_name), "OK"); + ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.enter_hint_wallet_name), "OK"); return false; } if (TextUtils.isEmpty(walletWords) || walletWords.split(" ") == null || walletWords.split(" ").length < 12) { - ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.str_mnemonic_incorrect), "OK"); + ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.dialog_title_mnemonic_incorrect), "OK"); return false; } if (TextUtils.isEmpty(walletPwd)) { - ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.str_no_pwd), "OK"); + ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.dialog_content_no_password), "OK"); return false; } if (TextUtils.isEmpty(walletPwdRepeat)) { - ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.str_no_verify_pwd), "OK"); + ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.dialog_content_no_verify_password), "OK"); return false; } if (!TextUtils.equals(walletPwdRepeat, walletPwd)) { - ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.str_verify_pwd_error), "OK"); + ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.dialog_content_passwords_unmatch), "OK"); return false; } if (walletPwd.length() < 8) { - ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.str_short_pwd), "OK"); + ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.dialog_content_short_password), "OK"); return false; } if (!readedTerms) { - ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.str_no_read_service), "OK"); + ViewUtil.showSysAlertDialog(getActivity(), getString(R.string.dialog_content_no_read_service), "OK"); return false; } return true; @@ -183,7 +183,7 @@ public void onGetWResult(int ret, GsonUtil extra) { if (isWalletExsit(address)) { if (flag == 1) { //导入钱包 - ToastUtil.toast(getActivity(), getString(R.string.str_wallet_exists)); + ToastUtil.toast(getActivity(), getString(R.string.toast_wallet_exists)); return; } else if (flag == 2) { //重置密码 @@ -195,7 +195,7 @@ public void onGetWResult(int ret, GsonUtil extra) { uploadWallet(mEdtWalletName.getText().toString(), extra.getInt("blockType", -1), FileUtil.getStringContent(password), privateKey, address); } else { - ToastUtil.toast(getActivity(), getString(R.string.str_import_wallet_failed)); + ToastUtil.toast(getActivity(), getString(R.string.toast_import_wallet_failed)); } } }); diff --git a/app/src/main/java/com/tokenbank/net/apirequest/ApiRequest.java b/app/src/main/java/com/tokenbank/net/apirequest/ApiRequest.java index da08757..01f2130 100755 --- a/app/src/main/java/com/tokenbank/net/apirequest/ApiRequest.java +++ b/app/src/main/java/com/tokenbank/net/apirequest/ApiRequest.java @@ -98,13 +98,13 @@ public void onResponse(String s) { @Override public void onErrorResponse(VolleyError volleyError) { TLog.d(TAG, "RxJava request Exception = " + volleyError); - String errMsg = AppConfig.getContext().getString(R.string.str_network_error); + String errMsg = AppConfig.getContext().getString(R.string.content_network_err); int errCode = AppConfig.ERR_CODE.NETWORK_ERR; if (volleyError != null && volleyError.networkResponse != null) { errCode = volleyError.networkResponse.statusCode; errMsg = volleyError.toString(); } - subscriber.onError(new Throwable(errMsg + AppConfig.getContext().getString(R.string.str_error_code) + errCode)); + subscriber.onError(new Throwable(errMsg + AppConfig.getContext().getString(R.string.content_error_code) + errCode)); } }); request.setShouldCache(shouldCache); diff --git a/app/src/main/java/com/tokenbank/utils/PermissionUtil.java b/app/src/main/java/com/tokenbank/utils/PermissionUtil.java index 2d29b5c..d060af9 100755 --- a/app/src/main/java/com/tokenbank/utils/PermissionUtil.java +++ b/app/src/main/java/com/tokenbank/utils/PermissionUtil.java @@ -15,7 +15,6 @@ import com.tokenbank.R; -import com.tokenbank.config.AppConfig; import java.util.ArrayList; @@ -223,7 +222,7 @@ public static void doWithPermissionChecked(Activity activity, String[] permissio public static void showPermSetDialog(final Activity activity, final boolean needFinish, String... permissions) { StringBuilder tips = new StringBuilder(); - tips.append(activity.getString(R.string.str_require_permissions)); + tips.append(activity.getString(R.string.dialog_content_require_permissions)); for (int i = 0; i < permissions.length; ++i) { tips.append(getPermissionTip(activity, permissions[i])); @@ -232,13 +231,13 @@ public static void showPermSetDialog(final Activity activity, final boolean need } } - ViewUtil.showSysAlertDialog(activity, activity.getString(R.string.str_prompt), tips.toString(), activity.getString(R.string.str_cancel), new DialogInterface.OnClickListener() { + ViewUtil.showSysAlertDialog(activity, activity.getString(R.string.dialog_title_reminder), tips.toString(), activity.getString(R.string.dialog_btn_cancel), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); activity.finish(); } - }, activity.getString(R.string.str_setting), new DialogInterface.OnClickListener() { + }, activity.getString(R.string.dialog_btn_setting), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); @@ -254,15 +253,15 @@ public static String getPermissionTip(Context context, String permission) { return var2; } else { if ("android.permission.CAMERA".equals(permission)) { - var2 = context.getString(R.string.str_camera); + var2 = context.getString(R.string.dialog_content_camera); } if ("android.permission.WRITE_EXTERNAL_STORAGE".equals(permission)) { - var2 = context.getString(R.string.str_sd_card); + var2 = context.getString(R.string.dialog_content_sd_card); } if (Manifest.permission.READ_PHONE_STATE.equals(permission)) { - var2 = context.getString(R.string.str_phone_status); + var2 = context.getString(R.string.dialog_content_phone_status); } return var2; diff --git a/app/src/main/java/com/tokenbank/utils/ToastUtil.java b/app/src/main/java/com/tokenbank/utils/ToastUtil.java index f73a3ba..8c84eca 100755 --- a/app/src/main/java/com/tokenbank/utils/ToastUtil.java +++ b/app/src/main/java/com/tokenbank/utils/ToastUtil.java @@ -11,7 +11,7 @@ public class ToastUtil { public static void toast(Context context, String msg) { if (TextUtils.isEmpty(msg)) { - Toast.makeText(context, context.getString(R.string.str_no_messages), Toast.LENGTH_SHORT).show(); + Toast.makeText(context, context.getString(R.string.toast_no_messages), Toast.LENGTH_SHORT).show(); } Toast.makeText(context, msg, Toast.LENGTH_SHORT).show(); } diff --git a/app/src/main/java/com/tokenbank/utils/ViewUtil.java b/app/src/main/java/com/tokenbank/utils/ViewUtil.java index afae304..98e57c7 100755 --- a/app/src/main/java/com/tokenbank/utils/ViewUtil.java +++ b/app/src/main/java/com/tokenbank/utils/ViewUtil.java @@ -51,7 +51,7 @@ public static void showSysAlertDialog(Context context, String title, String mess } public static void showBakupDialog(final Context context, final WalletInfoManager.WData walletData, boolean canCancel, final boolean needVerifyPwd, final String pwdHash) { - final WarnDialog warnDialog = new WarnDialog(context, context.getString(R.string.str_wallet_security_tips), context.getString(R.string.str_backup), canCancel, + final WarnDialog warnDialog = new WarnDialog(context, context.getString(R.string.dialog_content_wallet_security), context.getString(R.string.dialog_btn_backup), canCancel, new WarnDialog.OnConfirmClickListener() { @Override public void onConfirmClick(final Dialog dialog, View view) { @@ -70,7 +70,7 @@ public void authPwd(String tag, boolean result) { } dialog.dismiss(); } else { - ToastUtil.toast(context, context.getString(R.string.str_pwd_error)); + ToastUtil.toast(context, context.getString(R.string.toast_password_incorrect)); } } }, pwdHash, ""); diff --git a/app/src/main/java/com/zxing/activity/CaptureActivity.java b/app/src/main/java/com/zxing/activity/CaptureActivity.java index 470bdd6..38fa056 100755 --- a/app/src/main/java/com/zxing/activity/CaptureActivity.java +++ b/app/src/main/java/com/zxing/activity/CaptureActivity.java @@ -76,7 +76,7 @@ public void onCreate(Bundle savedInstanceState) { TitleBar mTitleBar = findViewById(R.id.title_bar); mTitleBar.setLeftDrawable(R.drawable.ic_back); - mTitleBar.setTitle(getString(R.string.str_scan)); + mTitleBar.setTitle(getString(R.string.titleBar_scan)); mTitleBar.setTitleBarClickListener(new TitleBar.TitleBarListener() { @Override public void onLeftClick(View view) { @@ -119,7 +119,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { cursor.close(); mProgress = new ProgressDialog(CaptureActivity.this); - mProgress.setMessage(getString(R.string.str_scanning)); + mProgress.setMessage(getString(R.string.dialog_content_scanning)); mProgress.setCancelable(false); mProgress.show(); diff --git a/app/src/main/res/color/selector_tvadd_token_txtcolor.xml b/app/src/main/res/color/selector_tvadd_token_txtcolor.xml deleted file mode 100755 index 5a601ab..0000000 --- a/app/src/main/res/color/selector_tvadd_token_txtcolor.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-xxhdpi/ic_article_defaultcover.png b/app/src/main/res/drawable-xxhdpi/ic_article_defaultcover.png deleted file mode 100755 index d04b40b..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_article_defaultcover.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_asset_preview.png b/app/src/main/res/drawable-xxhdpi/ic_asset_preview.png deleted file mode 100755 index 7098767..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_asset_preview.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_circle_select.png b/app/src/main/res/drawable-xxhdpi/ic_circle_select.png deleted file mode 100755 index 2a12531..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_circle_select.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_circle_unselect.png b/app/src/main/res/drawable-xxhdpi/ic_circle_unselect.png deleted file mode 100755 index 682a3b9..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_circle_unselect.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_edit.png b/app/src/main/res/drawable-xxhdpi/ic_edit.png deleted file mode 100755 index b16bac3..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_edit.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_images_asset_addasset.png b/app/src/main/res/drawable-xxhdpi/ic_images_asset_addasset.png deleted file mode 100755 index f5c7dea..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_images_asset_addasset.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_images_asset_menu.png b/app/src/main/res/drawable-xxhdpi/ic_images_asset_menu.png deleted file mode 100755 index 2afe1cd..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_images_asset_menu.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_images_asset_search.png b/app/src/main/res/drawable-xxhdpi/ic_images_asset_search.png deleted file mode 100755 index 321274b..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_images_asset_search.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_images_asset_sucess.png b/app/src/main/res/drawable-xxhdpi/ic_images_asset_sucess.png deleted file mode 100755 index 58d7070..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_images_asset_sucess.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_images_asset_walletaddress.png b/app/src/main/res/drawable-xxhdpi/ic_images_asset_walletaddress.png deleted file mode 100755 index 7c5cc8c..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_images_asset_walletaddress.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_images_common_arrow.png b/app/src/main/res/drawable-xxhdpi/ic_images_common_arrow.png deleted file mode 100755 index 3069dac..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_images_common_arrow.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_images_common_checkbox_normal.png b/app/src/main/res/drawable-xxhdpi/ic_images_common_checkbox_normal.png deleted file mode 100755 index 7c91d1e..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_images_common_checkbox_normal.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_images_common_checkbox_normal_disabled.png b/app/src/main/res/drawable-xxhdpi/ic_images_common_checkbox_normal_disabled.png deleted file mode 100755 index 63f15eb..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_images_common_checkbox_normal_disabled.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_images_common_closedark.png b/app/src/main/res/drawable-xxhdpi/ic_images_common_closedark.png deleted file mode 100755 index a5033a0..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_images_common_closedark.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_images_common_createwallet.png b/app/src/main/res/drawable-xxhdpi/ic_images_common_createwallet.png deleted file mode 100755 index 35e369d..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_images_common_createwallet.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_images_common_delete.png b/app/src/main/res/drawable-xxhdpi/ic_images_common_delete.png deleted file mode 100755 index 482104e..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_images_common_delete.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_images_common_help.png b/app/src/main/res/drawable-xxhdpi/ic_images_common_help.png deleted file mode 100755 index 5159e06..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_images_common_help.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_images_common_newdark.png b/app/src/main/res/drawable-xxhdpi/ic_images_common_newdark.png deleted file mode 100755 index aee78df..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_images_common_newdark.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_images_common_reload.png b/app/src/main/res/drawable-xxhdpi/ic_images_common_reload.png deleted file mode 100755 index 794a6d4..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_images_common_reload.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_images_common_scan.png b/app/src/main/res/drawable-xxhdpi/ic_images_common_scan.png deleted file mode 100755 index d688417..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_images_common_scan.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_images_common_search.png b/app/src/main/res/drawable-xxhdpi/ic_images_common_search.png deleted file mode 100755 index d8f03bb..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_images_common_search.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_images_profile_transaction.png b/app/src/main/res/drawable-xxhdpi/ic_images_profile_transaction.png deleted file mode 100755 index a1b4b9e..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_images_profile_transaction.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_images_profile_wallet.png b/app/src/main/res/drawable-xxhdpi/ic_images_profile_wallet.png deleted file mode 100755 index ae0ada0..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_images_profile_wallet.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_images_terms_checked_large.png b/app/src/main/res/drawable-xxhdpi/ic_images_terms_checked_large.png deleted file mode 100755 index 56ee612..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_images_terms_checked_large.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_images_terms_normal_large.png b/app/src/main/res/drawable-xxhdpi/ic_images_terms_normal_large.png deleted file mode 100755 index 6be5694..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_images_terms_normal_large.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_images_token_bg.png b/app/src/main/res/drawable-xxhdpi/ic_images_token_bg.png deleted file mode 100755 index e73ef82..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_images_token_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_manage_wallet.png b/app/src/main/res/drawable-xxhdpi/ic_manage_wallet.png deleted file mode 100755 index 6fb600d..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_manage_wallet.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_market_empty.png b/app/src/main/res/drawable-xxhdpi/ic_market_empty.png deleted file mode 100755 index 81e5153..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_market_empty.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_market_sort.png b/app/src/main/res/drawable-xxhdpi/ic_market_sort.png deleted file mode 100755 index d300ac9..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_market_sort.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_personal.png b/app/src/main/res/drawable-xxhdpi/ic_personal.png deleted file mode 100755 index ca9c590..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_personal.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_pop_item_add.png b/app/src/main/res/drawable-xxhdpi/ic_pop_item_add.png deleted file mode 100755 index c7b721c..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_pop_item_add.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_scan.png b/app/src/main/res/drawable-xxhdpi/ic_scan.png deleted file mode 100755 index ce71f03..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_scan.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_search.png b/app/src/main/res/drawable-xxhdpi/ic_search.png deleted file mode 100755 index 18254f5..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_search.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_search_btn.png b/app/src/main/res/drawable-xxhdpi/ic_search_btn.png deleted file mode 100755 index 9adbddd..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_search_btn.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_search_market.png b/app/src/main/res/drawable-xxhdpi/ic_search_market.png deleted file mode 100755 index ff49e75..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_search_market.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_tab_find_selected.png b/app/src/main/res/drawable-xxhdpi/ic_tab_find_selected.png deleted file mode 100755 index a5f9833..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_tab_find_selected.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_tab_find_unselected.png b/app/src/main/res/drawable-xxhdpi/ic_tab_find_unselected.png deleted file mode 100755 index 21d4963..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_tab_find_unselected.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_tab_market_selected.png b/app/src/main/res/drawable-xxhdpi/ic_tab_market_selected.png deleted file mode 100755 index 79c279a..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_tab_market_selected.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_tab_market_unselected.png b/app/src/main/res/drawable-xxhdpi/ic_tab_market_unselected.png deleted file mode 100755 index e251a62..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_tab_market_unselected.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_token_checked.png b/app/src/main/res/drawable-xxhdpi/ic_token_checked.png deleted file mode 100755 index f833e7c..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_token_checked.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_transaction_record.png b/app/src/main/res/drawable-xxhdpi/ic_transaction_record.png deleted file mode 100755 index d417012..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_transaction_record.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/instabug_fab_bg_normal.png b/app/src/main/res/drawable-xxhdpi/instabug_fab_bg_normal.png deleted file mode 100755 index c157df3..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/instabug_fab_bg_normal.png and /dev/null differ diff --git a/app/src/main/res/drawable/drawer_shadow.xml b/app/src/main/res/drawable/drawer_shadow.xml deleted file mode 100755 index e1d5bc5..0000000 --- a/app/src/main/res/drawable/drawer_shadow.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100755 index 3a37cf6..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ripple_bg.xml b/app/src/main/res/drawable/ripple_bg.xml deleted file mode 100755 index 62b9127..0000000 --- a/app/src/main/res/drawable/ripple_bg.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_guide_indicator_bg.xml b/app/src/main/res/drawable/selector_guide_indicator_bg.xml deleted file mode 100755 index d48dfb4..0000000 --- a/app/src/main/res/drawable/selector_guide_indicator_bg.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_market_itemstate.xml b/app/src/main/res/drawable/selector_market_itemstate.xml deleted file mode 100755 index fae26eb..0000000 --- a/app/src/main/res/drawable/selector_market_itemstate.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_terms_bg.xml b/app/src/main/res/drawable/selector_terms_bg.xml deleted file mode 100755 index 4f7515e..0000000 --- a/app/src/main/res/drawable/selector_terms_bg.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_tv_increase_bg.xml b/app/src/main/res/drawable/selector_tv_increase_bg.xml deleted file mode 100755 index e575439..0000000 --- a/app/src/main/res/drawable/selector_tv_increase_bg.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_tvadd_token.xml b/app/src/main/res/drawable/selector_tvadd_token.xml deleted file mode 100755 index ba53949..0000000 --- a/app/src/main/res/drawable/selector_tvadd_token.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_indicator_pointbg.xml b/app/src/main/res/drawable/shape_indicator_pointbg.xml deleted file mode 100755 index 40c3c2f..0000000 --- a/app/src/main/res/drawable/shape_indicator_pointbg.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_ripple.xml b/app/src/main/res/drawable/shape_ripple.xml deleted file mode 100755 index 84ee4d4..0000000 --- a/app/src/main/res/drawable/shape_ripple.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_search_bg.xml b/app/src/main/res/drawable/shape_search_bg.xml deleted file mode 100755 index 1d29d1d..0000000 --- a/app/src/main/res/drawable/shape_search_bg.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_startbtn_bg.xml b/app/src/main/res/drawable/shape_startbtn_bg.xml deleted file mode 100755 index 208d14c..0000000 --- a/app/src/main/res/drawable/shape_startbtn_bg.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/term_checkbox_bg.xml b/app/src/main/res/drawable/term_checkbox_bg.xml deleted file mode 100755 index 46e7441..0000000 --- a/app/src/main/res/drawable/term_checkbox_bg.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index dd6cfdb..102076e 100755 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -40,7 +40,7 @@ android:layout_marginTop="10dp" android:textSize="13sp" android:textColor="#333333" - android:text="@string/str_about_token_pocket" /> + android:text="@string/content_about_token_pocket" /> @@ -84,7 +84,7 @@ @@ -111,7 +111,7 @@ diff --git a/app/src/main/res/layout/activity_addtoken.xml b/app/src/main/res/layout/activity_addtoken.xml deleted file mode 100755 index b536b28..0000000 --- a/app/src/main/res/layout/activity_addtoken.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_bakup_wallet_info.xml b/app/src/main/res/layout/activity_bakup_wallet_info.xml index 68d67f8..b4ea9de 100755 --- a/app/src/main/res/layout/activity_bakup_wallet_info.xml +++ b/app/src/main/res/layout/activity_bakup_wallet_info.xml @@ -17,7 +17,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="42dp" - android:text="@string/str_copy_wallet_mnemonic" + android:text="@string/title_copy_mnemonic" android:textColor="@color/common_black_fontcolor" android:textSize="18sp" /> @@ -28,7 +28,7 @@ android:layout_marginLeft="15dp" android:layout_marginRight="15dp" android:layout_marginTop="15dp" - android:text="@string/str_about_mnemonic" + android:text="@string/content_copy_mnemonic" android:textColor="#808080" android:textSize="14sp" /> @@ -74,7 +74,7 @@ android:layout_marginTop="40dp" android:background="@drawable/shape_splash_createwallet_bg" android:gravity="center" - android:text="@string/str_next" + android:text="@string/btn_next" android:textColor="@color/white" android:textSize="17sp" /> diff --git a/app/src/main/res/layout/activity_bakup_wallet_pk.xml b/app/src/main/res/layout/activity_bakup_wallet_pk.xml deleted file mode 100755 index 387f5d8..0000000 --- a/app/src/main/res/layout/activity_bakup_wallet_pk.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_bakup_wallet_start.xml b/app/src/main/res/layout/activity_bakup_wallet_start.xml index 2daf126..3477515 100755 --- a/app/src/main/res/layout/activity_bakup_wallet_start.xml +++ b/app/src/main/res/layout/activity_bakup_wallet_start.xml @@ -47,7 +47,7 @@ android:layout_marginTop="35dp" android:background="@drawable/shape_splash_createwallet_bg" android:gravity="center" - android:text="@string/str_backup_wallet" + android:text="@string/btn_backup_wallet" android:textColor="@color/white" android:textSize="17sp" /> diff --git a/app/src/main/res/layout/activity_camera.xml b/app/src/main/res/layout/activity_camera.xml deleted file mode 100755 index 7047b0e..0000000 --- a/app/src/main/res/layout/activity_camera.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_confirm_walletinfo.xml b/app/src/main/res/layout/activity_confirm_walletinfo.xml index 1fe17fb..b2401ac 100755 --- a/app/src/main/res/layout/activity_confirm_walletinfo.xml +++ b/app/src/main/res/layout/activity_confirm_walletinfo.xml @@ -17,7 +17,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="42dp" - android:text="@string/str_confirm_mnemonic" + android:text="@string/title_verify_mnemonic" android:textColor="@color/common_black_fontcolor" android:textSize="18sp" /> @@ -28,7 +28,7 @@ android:layout_marginLeft="15dp" android:layout_marginRight="15dp" android:layout_marginTop="15dp" - android:text="@string/str_confirm_mnemonic_order" + android:text="@string/content_verify_mnemonic" android:textColor="#808080" android:textSize="14sp" /> @@ -73,7 +73,7 @@ android:layout_marginTop="40dp" android:background="@drawable/shape_splash_createwallet_bg" android:gravity="center" - android:text="@string/str_completed" + android:text="@string/titleBar_completed" android:textColor="@color/white" android:textSize="17sp" /> diff --git a/app/src/main/res/layout/activity_create_wallet.xml b/app/src/main/res/layout/activity_create_wallet.xml deleted file mode 100755 index e13f4d0..0000000 --- a/app/src/main/res/layout/activity_create_wallet.xml +++ /dev/null @@ -1,178 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_create_wallet_new.xml b/app/src/main/res/layout/activity_create_wallet_new.xml index 2c2585a..5006e2b 100755 --- a/app/src/main/res/layout/activity_create_wallet_new.xml +++ b/app/src/main/res/layout/activity_create_wallet_new.xml @@ -22,7 +22,7 @@ + android:text="@string/enter_title_block" /> @@ -42,12 +42,12 @@ + android:text="@string/enter_title_wallet_name" /> + android:hint="@string/enter_hint_wallet_name" /> @@ -56,12 +56,12 @@ + android:text="@string/enter_title_password" /> + android:hint="@string/enter_hint_password" /> @@ -70,12 +70,12 @@ + android:text="@string/enter_title_verify" /> + android:hint="@string/enter_hint_verify" /> @@ -89,13 +89,13 @@ + android:text="@string/enter_title_prompt" /> @@ -107,10 +107,12 @@ + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="10dp" + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:orientation="horizontal"> - - @@ -143,6 +134,6 @@ android:id="@+id/btn_confirm" style="@style/Style.Btn.Theme" android:layout_marginTop="50dp" - android:text="@string/str_create_wallet" /> + android:text="@string/btn_create_wallet_done" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_guide_createwallet.xml b/app/src/main/res/layout/activity_guide_createwallet.xml deleted file mode 100755 index f1e0c7f..0000000 --- a/app/src/main/res/layout/activity_guide_createwallet.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - -