Commit f630a634 authored by fallenstardust's avatar fallenstardust

优化Toast封装

parent 1616b209
...@@ -54,13 +54,12 @@ import java.util.List; ...@@ -54,13 +54,12 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
import cn.garymb.ygomobile.core.IrrlichtBridge; import cn.garymb.ygomobile.core.IrrlichtBridge;
import cn.garymb.ygomobile.lite.BuildConfig;
import cn.garymb.ygomobile.lite.R; import cn.garymb.ygomobile.lite.R;
import cn.garymb.ygomobile.ui.settings.SharedPreferencesPlus; import cn.garymb.ygomobile.ui.settings.SharedPreferencesPlus;
import cn.garymb.ygomobile.utils.DeckUtil; import cn.garymb.ygomobile.utils.DeckUtil;
import cn.garymb.ygomobile.utils.DensityUtils;
import cn.garymb.ygomobile.utils.FileUtils; import cn.garymb.ygomobile.utils.FileUtils;
import cn.garymb.ygomobile.utils.IOUtils; import cn.garymb.ygomobile.utils.IOUtils;
import cn.garymb.ygomobile.utils.YGOUtil;
/** /**
* 静态类 * 静态类
...@@ -195,7 +194,7 @@ public class AppsSettings { ...@@ -195,7 +194,7 @@ public class AppsSettings {
} }
int ret = Math.min(w, h); int ret = Math.min(w, h);
//测试代码,曲面屏左右2变需要留空白,但是游戏画面比例不对,需要修改c那边代码 //测试代码,曲面屏左右2变需要留空白,但是游戏画面比例不对,需要修改c那边代码
int fix_h = DensityUtils.dp2px(context, getScreenPadding()); int fix_h = YGOUtil.dp2px(getScreenPadding());
Log.d(IrrlichtBridge.TAG, "screen padding=" + fix_h); Log.d(IrrlichtBridge.TAG, "screen padding=" + fix_h);
return ret - fix_h * 2; return ret - fix_h * 2;
} }
......
...@@ -84,7 +84,7 @@ public class GameUriManager { ...@@ -84,7 +84,7 @@ public class GameUriManager {
options.mRoomName = intent.getStringExtra(Constants.QUERY_ROOM); options.mRoomName = intent.getStringExtra(Constants.QUERY_ROOM);
YGOStarter.startGame(getActivity(), options); YGOStarter.startGame(getActivity(), options);
} catch (Exception e) { } catch (Exception e) {
Toast.makeText(getActivity(), R.string.start_game_error, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(activity.getString(R.string.start_game_error));
activity.finish(); activity.finish();
} }
} else { } else {
...@@ -242,10 +242,10 @@ public class GameUriManager { ...@@ -242,10 +242,10 @@ public class GameUriManager {
if (!AppsSettings.get().isReadExpansions()) { if (!AppsSettings.get().isReadExpansions()) {
startSetting.putExtra("flag", 4); startSetting.putExtra("flag", 4);
activity.startActivity(startSetting);//todo ??再次打开MainActivity? activity.startActivity(startSetting);//todo ??再次打开MainActivity?
Toast.makeText(activity, R.string.ypk_go_setting, Toast.LENGTH_LONG).show(); YGOUtil.showTextToast(activity.getString(R.string.start_game_error), Toast.LENGTH_LONG);
} else { } else {
DataManager.get().load(true); DataManager.get().load(true);
Toast.makeText(activity, R.string.ypk_installed, Toast.LENGTH_LONG).show(); YGOUtil.showTextToast(activity.getString(R.string.ypk_installed), Toast.LENGTH_LONG);
loadServerInfoFromZipOrYpk(getActivity(), file); loadServerInfoFromZipOrYpk(getActivity(), file);
//ypk不与excard机制相干涉 //ypk不与excard机制相干涉
...@@ -253,20 +253,20 @@ public class GameUriManager { ...@@ -253,20 +253,20 @@ public class GameUriManager {
} else if (isYrp) { } else if (isYrp) {
if (!YGOStarter.isGameRunning(getActivity())) { if (!YGOStarter.isGameRunning(getActivity())) {
YGOStarter.startGame(getActivity(), null, "-r", file.getName()); YGOStarter.startGame(getActivity(), null, "-r", file.getName());
Toast.makeText(activity, activity.getString(R.string.file_installed), Toast.LENGTH_LONG).show(); YGOUtil.showTextToast(activity.getString(R.string.file_installed), Toast.LENGTH_LONG);
} else { } else {
Log.w(Constants.TAG, "game is running"); Log.w(Constants.TAG, "game is running");
} }
} else if (isLua) { } else if (isLua) {
if (!YGOStarter.isGameRunning(getActivity())) { if (!YGOStarter.isGameRunning(getActivity())) {
YGOStarter.startGame(getActivity(), null, "-s", file.getName()); YGOStarter.startGame(getActivity(), null, "-s", file.getName());
Toast.makeText(activity, "load single lua file", Toast.LENGTH_LONG).show(); YGOUtil.showTextToast("load single lua file", Toast.LENGTH_LONG);
} else { } else {
Log.w(Constants.TAG, "game is running"); Log.w(Constants.TAG, "game is running");
} }
} else if (isConf) { } else if (isConf) {
DataManager.get().load(true); DataManager.get().load(true);
Toast.makeText(activity, activity.getString(R.string.restart_app), Toast.LENGTH_LONG).show(); YGOUtil.showTextToast(activity.getString(R.string.restart_app), Toast.LENGTH_LONG);
} }
} else { } else {
String host = uri.getHost(); String host = uri.getHost();
......
...@@ -12,6 +12,7 @@ import cn.garymb.ygomobile.AppsSettings; ...@@ -12,6 +12,7 @@ import cn.garymb.ygomobile.AppsSettings;
import cn.garymb.ygomobile.YGOStarter; import cn.garymb.ygomobile.YGOStarter;
import cn.garymb.ygomobile.lite.R; import cn.garymb.ygomobile.lite.R;
import cn.garymb.ygomobile.ui.home.MainActivity; import cn.garymb.ygomobile.ui.home.MainActivity;
import cn.garymb.ygomobile.utils.YGOUtil;
public class LogoActivity extends Activity { public class LogoActivity extends Activity {
Handler handler; Handler handler;
...@@ -39,7 +40,7 @@ public class LogoActivity extends Activity { ...@@ -39,7 +40,7 @@ public class LogoActivity extends Activity {
} }
}; };
handler.postDelayed(runnable, 1000); handler.postDelayed(runnable, 1000);
Toast.makeText(LogoActivity.this, R.string.logo_text, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(LogoActivity.this.getString(R.string.logo_text), Toast.LENGTH_SHORT);
} }
if (!isTaskRoot()) { if (!isTaskRoot()) {
finish(); finish();
......
...@@ -15,6 +15,7 @@ import cn.garymb.ygomobile.AppsSettings; ...@@ -15,6 +15,7 @@ import cn.garymb.ygomobile.AppsSettings;
import cn.garymb.ygomobile.core.IrrlichtBridge; import cn.garymb.ygomobile.core.IrrlichtBridge;
import cn.garymb.ygomobile.lite.R; import cn.garymb.ygomobile.lite.R;
import cn.garymb.ygomobile.utils.FileUtils; import cn.garymb.ygomobile.utils.FileUtils;
import cn.garymb.ygomobile.utils.YGOUtil;
public class ShareFileActivity extends Activity { public class ShareFileActivity extends Activity {
@Override @Override
...@@ -56,7 +57,7 @@ public class ShareFileActivity extends Activity { ...@@ -56,7 +57,7 @@ public class ShareFileActivity extends Activity {
try { try {
startActivity(Intent.createChooser(shareIntent, getString(R.string.send))); startActivity(Intent.createChooser(shareIntent, getString(R.string.send)));
} catch (Exception e) { } catch (Exception e) {
Toast.makeText(this, getString(R.string.sending_failed) + e, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(getString(R.string.sending_failed) + e, Toast.LENGTH_LONG);
} }
finish(); finish();
} }
......
...@@ -419,7 +419,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder { ...@@ -419,7 +419,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
try { try {
context.startActivity(intent); context.startActivity(intent);
} catch (Throwable e) { } catch (Throwable e) {
Toast.makeText(context, "dev error:not found activity.", Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast("dev error:not found activity.", Toast.LENGTH_SHORT);
} }
}); });
......
...@@ -43,6 +43,7 @@ import cn.garymb.ygomobile.ui.home.HomeActivity; ...@@ -43,6 +43,7 @@ import cn.garymb.ygomobile.ui.home.HomeActivity;
import cn.garymb.ygomobile.ui.plus.AOnGestureListener; import cn.garymb.ygomobile.ui.plus.AOnGestureListener;
import cn.garymb.ygomobile.ui.plus.DialogPlus; import cn.garymb.ygomobile.ui.plus.DialogPlus;
import cn.garymb.ygomobile.ui.plus.VUiKit; import cn.garymb.ygomobile.ui.plus.VUiKit;
import cn.garymb.ygomobile.utils.YGOUtil;
import cn.garymb.ygomobile.utils.glide.GlideCompat; import cn.garymb.ygomobile.utils.glide.GlideCompat;
import ocgcore.DataManager; import ocgcore.DataManager;
import ocgcore.data.Card; import ocgcore.data.Card;
...@@ -103,7 +104,7 @@ public class CardSearchFragment extends BaseFragemnt implements CardLoader.CallB ...@@ -103,7 +104,7 @@ public class CardSearchFragment extends BaseFragemnt implements CardLoader.CallB
mCardLoader.setLimitList(activity.getmLimitManager().getTopLimit()); mCardLoader.setLimitList(activity.getmLimitManager().getTopLimit());
} }
}).fail((e) -> { }).fail((e) -> {
Toast.makeText(getContext(), R.string.tip_load_cdb_error, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(getString(R.string.tip_load_cdb_error), Toast.LENGTH_SHORT);
Log.e(IrrlichtBridge.TAG, "load cdb", e); Log.e(IrrlichtBridge.TAG, "load cdb", e);
}).done((rs) -> { }).done((rs) -> {
dlg.dismiss(); dlg.dismiss();
...@@ -259,7 +260,7 @@ public class CardSearchFragment extends BaseFragemnt implements CardLoader.CallB ...@@ -259,7 +260,7 @@ public class CardSearchFragment extends BaseFragemnt implements CardLoader.CallB
return false; return false;
} else { } else {
exitLasttime = System.currentTimeMillis(); exitLasttime = System.currentTimeMillis();
Toast.makeText(getContext(), R.string.back_tip, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(R.string.back_tip, Toast.LENGTH_SHORT);
} }
} }
return true; return true;
......
...@@ -664,7 +664,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte ...@@ -664,7 +664,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
return false; return false;
} else { } else {
exitLasttime = System.currentTimeMillis(); exitLasttime = System.currentTimeMillis();
Toast.makeText(getContext(), R.string.back_tip, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(R.string.back_tip);
} }
} }
return true; return true;
...@@ -679,22 +679,22 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte ...@@ -679,22 +679,22 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
return count != null && count <= 3; return count != null && count <= 3;
} }
if (limitList.check(cardInfo, LimitType.Forbidden)) { if (limitList.check(cardInfo, LimitType.Forbidden)) {
Toast.makeText(getContext(), getString(R.string.tip_card_max, 0), Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(getString(R.string.tip_card_max, 0));
return false; return false;
} }
if (count != null) { if (count != null) {
if (limitList.check(cardInfo, LimitType.Limit)) { if (limitList.check(cardInfo, LimitType.Limit)) {
if (count >= 1) { if (count >= 1) {
Toast.makeText(getContext(), getString(R.string.tip_card_max, 1), Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(getString(R.string.tip_card_max, 1));
return false; return false;
} }
} else if (limitList.check(cardInfo, LimitType.SemiLimit)) { } else if (limitList.check(cardInfo, LimitType.SemiLimit)) {
if (count >= 2) { if (count >= 2) {
Toast.makeText(getContext(), getString(R.string.tip_card_max, 2), Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(getString(R.string.tip_card_max, 2));
return false; return false;
} }
} else if (count >= Constants.CARD_MAX_COUNT) { } else if (count >= Constants.CARD_MAX_COUNT) {
Toast.makeText(getContext(), getString(R.string.tip_card_max, 3), Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(getString(R.string.tip_card_max, 3));
return false; return false;
} }
} }
...@@ -739,7 +739,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte ...@@ -739,7 +739,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
break; break;
case R.id.action_share_deck: case R.id.action_share_deck:
if (mDeckAdapater.getYdkFile() == null) { if (mDeckAdapater.getYdkFile() == null) {
Toast.makeText(getContext(), R.string.unable_to_edit_empty_deck, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(R.string.unable_to_edit_empty_deck);
return true; return true;
} }
shareDeck(); shareDeck();
...@@ -754,7 +754,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte ...@@ -754,7 +754,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
} else { } else {
if (TextUtils.equals(mDeckAdapater.getYdkFile().getParent(), mSettings.getAiDeckDir()) || if (TextUtils.equals(mDeckAdapater.getYdkFile().getParent(), mSettings.getAiDeckDir()) ||
TextUtils.equals(mDeckAdapater.getYdkFile().getParent(), mSettings.getPackDeckDir())) { TextUtils.equals(mDeckAdapater.getYdkFile().getParent(), mSettings.getPackDeckDir())) {
Toast.makeText(getContext(), R.string.donot_edit_Deck, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(R.string.donot_edit_Deck);
} else { } else {
save(mDeckAdapater.getYdkFile()); save(mDeckAdapater.getYdkFile());
} }
...@@ -763,12 +763,12 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte ...@@ -763,12 +763,12 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
break; break;
case R.id.action_rename: case R.id.action_rename:
if (mDeckAdapater.getYdkFile() == null) { if (mDeckAdapater.getYdkFile() == null) {
Toast.makeText(getContext(), R.string.unable_to_edit_empty_deck, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(R.string.unable_to_edit_empty_deck);
return true; return true;
} }
if (TextUtils.equals(mDeckAdapater.getYdkFile().getParent(), mSettings.getAiDeckDir()) || if (TextUtils.equals(mDeckAdapater.getYdkFile().getParent(), mSettings.getAiDeckDir()) ||
TextUtils.equals(mDeckAdapater.getYdkFile().getParent(), mSettings.getPackDeckDir())) { TextUtils.equals(mDeckAdapater.getYdkFile().getParent(), mSettings.getPackDeckDir())) {
Toast.makeText(getContext(), R.string.donot_edit_Deck, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(R.string.donot_edit_Deck);
} else { } else {
inputDeckName(mDeckAdapater.getYdkFile(), mDeckAdapater.getYdkFile().getParent(), false); inputDeckName(mDeckAdapater.getYdkFile(), mDeckAdapater.getYdkFile().getParent(), false);
} }
...@@ -791,12 +791,12 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte ...@@ -791,12 +791,12 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
break; break;
case R.id.action_delete_deck: { case R.id.action_delete_deck: {
if (mDeckAdapater.getYdkFile() == null) { if (mDeckAdapater.getYdkFile() == null) {
Toast.makeText(getContext(), R.string.unable_to_edit_empty_deck, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(R.string.unable_to_edit_empty_deck);
return true; return true;
} }
if (TextUtils.equals(mDeckAdapater.getYdkFile().getParent(), mSettings.getAiDeckDir()) || if (TextUtils.equals(mDeckAdapater.getYdkFile().getParent(), mSettings.getAiDeckDir()) ||
TextUtils.equals(mDeckAdapater.getYdkFile().getParent(), mSettings.getPackDeckDir())) { TextUtils.equals(mDeckAdapater.getYdkFile().getParent(), mSettings.getPackDeckDir())) {
Toast.makeText(getContext(), R.string.donot_edit_Deck, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(R.string.donot_edit_Deck);
} else { } else {
builder.setTitle(R.string.question); builder.setTitle(R.string.question);
builder.setMessage(R.string.question_delete_deck); builder.setMessage(R.string.question_delete_deck);
...@@ -929,8 +929,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte ...@@ -929,8 +929,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
du.dis(); du.dis();
YGOUtil.copyMessage(getContext(), tv_code.getText().toString().trim()); YGOUtil.copyMessage(getContext(), tv_code.getText().toString().trim());
DuelAssistantManagement.getInstance().setLastMessage(tv_code.getText().toString().trim()); DuelAssistantManagement.getInstance().setLastMessage(tv_code.getText().toString().trim());
Toast.makeText(getContext(), getString(R.string.deck_text_copyed), Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(R.string.deck_text_copyed);
}); });
bt_image_share.setOnClickListener(v -> { bt_image_share.setOnClickListener(v -> {
...@@ -950,7 +949,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte ...@@ -950,7 +949,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
try { try {
startActivity(intent); startActivity(intent);
} catch (Throwable e) { } catch (Throwable e) {
Toast.makeText(getContext(), "dev error:not found activity.", Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast("dev error:not found activity." + e);
} }
}); });
...@@ -974,7 +973,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte ...@@ -974,7 +973,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
} else { } else {
clipboardManager.setText(uri); clipboardManager.setText(uri);
} }
Toast.makeText(getContext(), R.string.copy_to_clipbroad, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(R.string.copy_to_clipbroad);
} }
private File getSelectDeck(Spinner spinner) { private File getSelectDeck(Spinner spinner) {
...@@ -1082,7 +1081,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte ...@@ -1082,7 +1081,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
else else
ydk = new File(savePath, filename); ydk = new File(savePath, filename);
if (ydk.exists()) { if (ydk.exists()) {
Toast.makeText(getContext(), R.string.file_exist, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(R.string.file_exist);
return; return;
} }
if (!keepOld && oldYdk != null && oldYdk.exists()) { if (!keepOld && oldYdk != null && oldYdk.exists()) {
...@@ -1111,9 +1110,9 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte ...@@ -1111,9 +1110,9 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
private void save(File ydk) { private void save(File ydk) {
if (mDeckAdapater.save(ydk)) { if (mDeckAdapater.save(ydk)) {
Toast.makeText(getContext(), R.string.save_tip_ok, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(R.string.save_tip_ok);
} else { } else {
Toast.makeText(getContext(), R.string.save_tip_fail, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(R.string.save_tip_fail);
} }
} }
...@@ -1169,18 +1168,18 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte ...@@ -1169,18 +1168,18 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
files.delete(); files.delete();
} }
} catch (Throwable e) { } catch (Throwable e) {
Toast.makeText(getContext(), e + "", Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(e + "");
} }
Toast.makeText(getContext(), R.string.done, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(R.string.done);
} }
private void doRestoreDeck() { private void doRestoreDeck() {
try { try {
FileUtils.copyDir(ORI_DECK, mSettings.getDeckDir(), false); FileUtils.copyDir(ORI_DECK, mSettings.getDeckDir(), false);
} catch (Throwable e) { } catch (Throwable e) {
Toast.makeText(getContext(), e + "", Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(e + "");
} }
Toast.makeText(getContext(), R.string.done, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(R.string.done);
} }
@Override @Override
......
...@@ -21,6 +21,7 @@ import java.io.File; ...@@ -21,6 +21,7 @@ import java.io.File;
import cn.garymb.ygomobile.lite.R; import cn.garymb.ygomobile.lite.R;
import cn.garymb.ygomobile.ui.activities.BaseActivity; import cn.garymb.ygomobile.ui.activities.BaseActivity;
import cn.garymb.ygomobile.utils.IOUtils; import cn.garymb.ygomobile.utils.IOUtils;
import cn.garymb.ygomobile.utils.YGOUtil;
public class FileActivity extends BaseActivity implements AdapterView.OnItemClickListener, AdapterView.OnItemLongClickListener public class FileActivity extends BaseActivity implements AdapterView.OnItemClickListener, AdapterView.OnItemLongClickListener
...@@ -126,7 +127,7 @@ public class FileActivity extends BaseActivity implements AdapterView.OnItemClic ...@@ -126,7 +127,7 @@ public class FileActivity extends BaseActivity implements AdapterView.OnItemClic
if (!file.isDirectory()) { if (!file.isDirectory()) {
selectFile(file); selectFile(file);
} else { } else {
Toast.makeText(this, R.string.the_name_is_folder, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(R.string.the_name_is_folder);
return; return;
} }
} }
......
...@@ -23,6 +23,7 @@ import cn.garymb.ygomobile.Constants; ...@@ -23,6 +23,7 @@ import cn.garymb.ygomobile.Constants;
import cn.garymb.ygomobile.lite.R; import cn.garymb.ygomobile.lite.R;
import cn.garymb.ygomobile.ui.adapters.BaseAdapterPlus; import cn.garymb.ygomobile.ui.adapters.BaseAdapterPlus;
import cn.garymb.ygomobile.ui.plus.VUiKit; import cn.garymb.ygomobile.ui.plus.VUiKit;
import cn.garymb.ygomobile.utils.YGOUtil;
import cn.garymb.ygomobile.utils.glide.GlideCompat; import cn.garymb.ygomobile.utils.glide.GlideCompat;
class FileAdapter extends BaseAdapterPlus<File> { class FileAdapter extends BaseAdapterPlus<File> {
...@@ -236,15 +237,15 @@ class FileAdapter extends BaseAdapterPlus<File> { ...@@ -236,15 +237,15 @@ class FileAdapter extends BaseAdapterPlus<File> {
public ViewHolder(Context context) { public ViewHolder(Context context) {
icon = new ImageView(context); icon = new ImageView(context);
icon.setPadding(VUiKit.dpToPx(4), 0, 0, 0); icon.setPadding(YGOUtil.dp2px(4), 0, 0, 0);
icon.setScaleType(ImageView.ScaleType.FIT_CENTER); icon.setScaleType(ImageView.ScaleType.FIT_CENTER);
name = new TextView(context); name = new TextView(context);
name.setPadding(VUiKit.dpToPx(8), 0, 0, 0); name.setPadding(YGOUtil.dp2px(8), 0, 0, 0);
name.setSingleLine(); name.setSingleLine();
name.setGravity(Gravity.CENTER_VERTICAL); name.setGravity(Gravity.CENTER_VERTICAL);
checkBox = new CheckBox(context); checkBox = new CheckBox(context);
checkBox.setGravity(Gravity.CENTER_VERTICAL); checkBox.setGravity(Gravity.CENTER_VERTICAL);
checkBox.setPadding(VUiKit.dpToPx(4), 0, 0, 0); checkBox.setPadding(YGOUtil.dp2px(4), 0, 0, 0);
} }
} }
} }
...@@ -55,6 +55,7 @@ import cn.garymb.ygomobile.utils.OkhttpUtil; ...@@ -55,6 +55,7 @@ import cn.garymb.ygomobile.utils.OkhttpUtil;
import cn.garymb.ygomobile.utils.ScreenUtil; import cn.garymb.ygomobile.utils.ScreenUtil;
import cn.garymb.ygomobile.utils.ServerUtil; import cn.garymb.ygomobile.utils.ServerUtil;
import cn.garymb.ygomobile.utils.SharedPreferenceUtil; import cn.garymb.ygomobile.utils.SharedPreferenceUtil;
import cn.garymb.ygomobile.utils.YGOUtil;
import ocgcore.DataManager; import ocgcore.DataManager;
import ocgcore.LimitManager; import ocgcore.LimitManager;
import ocgcore.StringManager; import ocgcore.StringManager;
...@@ -397,8 +398,7 @@ public abstract class HomeActivity extends BaseActivity implements BottomNavigat ...@@ -397,8 +398,7 @@ public abstract class HomeActivity extends BaseActivity implements BottomNavigat
super.onBackPressed(); super.onBackPressed();
} else { } else {
exitLasttime = System.currentTimeMillis(); exitLasttime = System.currentTimeMillis();
if (fragment_home.isVisible() || fragment_settings.isVisible()) if (fragment_home.isVisible() || fragment_settings.isVisible()) YGOUtil.showTextToast(R.string.back_tip);
Toast.makeText(getContext(), R.string.back_tip, Toast.LENGTH_SHORT).show();
} }
} }
......
...@@ -301,7 +301,7 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene ...@@ -301,7 +301,7 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene
} else if (ServerUtil.exCardState == ServerUtil.ExCardState.NEED_UPDATE) { } else if (ServerUtil.exCardState == ServerUtil.ExCardState.NEED_UPDATE) {
ll_new_notice.setVisibility(View.VISIBLE); ll_new_notice.setVisibility(View.VISIBLE);
} else if (ServerUtil.exCardState == ServerUtil.ExCardState.ERROR) { } else if (ServerUtil.exCardState == ServerUtil.ExCardState.ERROR) {
Toast.makeText(getActivity(), R.string.ex_card_check_toast_message_iii, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(R.string.ex_card_check_toast_message_iii);
ll_new_notice.setVisibility(View.GONE); ll_new_notice.setVisibility(View.GONE);
} else if (ServerUtil.exCardState == ServerUtil.ExCardState.UNCHECKED) { } else if (ServerUtil.exCardState == ServerUtil.ExCardState.UNCHECKED) {
//do nothing //do nothing
...@@ -407,9 +407,7 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene ...@@ -407,9 +407,7 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene
builder.setLeftButtonListener((dlg, i) -> { builder.setLeftButtonListener((dlg, i) -> {
dlg.dismiss(); dlg.dismiss();
if (Build.VERSION.SDK_INT >= 23 && YGOStarter.isGameRunning(getActivity())) { if (Build.VERSION.SDK_INT >= 23 && YGOStarter.isGameRunning(getActivity())) {
Toast toast = Toast.makeText(App.get().getApplicationContext(), R.string.tip_return_to_duel, Toast.LENGTH_SHORT); YGOUtil.showTextToast(Gravity.CENTER, R.string.tip_return_to_duel);
toast.setGravity(Gravity.CENTER, 0, 0);
toast.show();
openGame(); openGame();
} else { } else {
//保存名字 //保存名字
...@@ -523,7 +521,7 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene ...@@ -523,7 +521,7 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene
String[] tipsList = this.getResources().getStringArray(R.array.tips); String[] tipsList = this.getResources().getStringArray(R.array.tips);
int x = (int) (Math.random() * tipsList.length); int x = (int) (Math.random() * tipsList.length);
String tips = tipsList[x]; String tips = tipsList[x];
Toast.makeText(getActivity(), tips, Toast.LENGTH_LONG).show(); YGOUtil.showTextToast(tips, Toast.LENGTH_LONG);
} }
} }
...@@ -669,10 +667,10 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene ...@@ -669,10 +667,10 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene
//如果是先行卡服务器,并且未开启先行卡设置,则通过toast提示 //如果是先行卡服务器,并且未开启先行卡设置,则通过toast提示
if (!AppsSettings.get().isReadExpansions()) { if (!AppsSettings.get().isReadExpansions()) {
Toast.makeText(getActivity(), R.string.ex_card_check_toast_message, Toast.LENGTH_LONG).show(); YGOUtil.showTextToast(R.string.ex_card_check_toast_message, Toast.LENGTH_LONG);
} else if (ServerUtil.exCardState != ServerUtil.ExCardState.UPDATED) { } else if (ServerUtil.exCardState != ServerUtil.ExCardState.UPDATED) {
//如果是先行卡服务器,并且未开启下载先行卡,则通过toast提示 //如果是先行卡服务器,并且未开启下载先行卡,则通过toast提示
Toast.makeText(getActivity(), R.string.ex_card_check_toast_message_ii, Toast.LENGTH_LONG).show(); YGOUtil.showTextToast(R.string.ex_card_check_toast_message_ii, Toast.LENGTH_LONG);
} }
} }
joinRoom(event.position); joinRoom(event.position);
...@@ -827,7 +825,7 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene ...@@ -827,7 +825,7 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene
case R.id.nav_webpage: { case R.id.nav_webpage: {
Intent intent = new Intent(Intent.ACTION_VIEW); Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse(Constants.URL_DONATE)); intent.setData(Uri.parse(Constants.URL_DONATE));
Toast.makeText(getActivity(), R.string.donatefor, Toast.LENGTH_LONG).show(); YGOUtil.showTextToast(R.string.donatefor, Toast.LENGTH_LONG);
startActivity(intent); startActivity(intent);
} }
break; break;
......
...@@ -35,6 +35,7 @@ import cn.garymb.ygomobile.ui.plus.DialogPlus; ...@@ -35,6 +35,7 @@ import cn.garymb.ygomobile.ui.plus.DialogPlus;
import cn.garymb.ygomobile.ui.plus.VUiKit; import cn.garymb.ygomobile.ui.plus.VUiKit;
import cn.garymb.ygomobile.utils.FileUtils; import cn.garymb.ygomobile.utils.FileUtils;
import cn.garymb.ygomobile.utils.NetUtils; import cn.garymb.ygomobile.utils.NetUtils;
import cn.garymb.ygomobile.utils.YGOUtil;
public class MainActivity extends HomeActivity implements BottomNavigationBar.OnTabSelectedListener { public class MainActivity extends HomeActivity implements BottomNavigationBar.OnTabSelectedListener {
private final String[] PERMISSIONS = { private final String[] PERMISSIONS = {
...@@ -148,9 +149,9 @@ public class MainActivity extends HomeActivity implements BottomNavigationBar.On ...@@ -148,9 +149,9 @@ public class MainActivity extends HomeActivity implements BottomNavigationBar.On
try { try {
FileUtils.copyDir(ORI_DECK, AppsSettings.get().getDeckDir(), false); FileUtils.copyDir(ORI_DECK, AppsSettings.get().getDeckDir(), false);
} catch (Throwable e) { } catch (Throwable e) {
Toast.makeText(MainActivity.this, e + "", Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(e + "", Toast.LENGTH_LONG);
} }
Toast.makeText(MainActivity.this, R.string.done, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(R.string.done);
} }
} }
......
...@@ -26,6 +26,7 @@ import cn.garymb.ygomobile.ui.plus.VUiKit; ...@@ -26,6 +26,7 @@ import cn.garymb.ygomobile.ui.plus.VUiKit;
import cn.garymb.ygomobile.utils.IOUtils; import cn.garymb.ygomobile.utils.IOUtils;
import cn.garymb.ygomobile.utils.SystemUtils; import cn.garymb.ygomobile.utils.SystemUtils;
import cn.garymb.ygomobile.utils.XmlUtils; import cn.garymb.ygomobile.utils.XmlUtils;
import cn.garymb.ygomobile.utils.YGOUtil;
import ocgcore.StringManager; import ocgcore.StringManager;
public class ServerListManager { public class ServerListManager {
...@@ -133,7 +134,7 @@ public class ServerListManager { ...@@ -133,7 +134,7 @@ public class ServerListManager {
if (TextUtils.isEmpty(info.getName()) if (TextUtils.isEmpty(info.getName())
|| TextUtils.isEmpty(info.getServerAddr()) || TextUtils.isEmpty(info.getServerAddr())
|| TextUtils.isEmpty(editViewHolder.serverPort.getText())) { || TextUtils.isEmpty(editViewHolder.serverPort.getText())) {
Toast.makeText(getContext(), R.string.server_is_exist, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(R.string.server_is_exist);
return; return;
} }
if (isAdd) { if (isAdd) {
......
...@@ -389,7 +389,7 @@ public class MycardFragment extends BaseFragemnt implements View.OnClickListener ...@@ -389,7 +389,7 @@ public class MycardFragment extends BaseFragemnt implements View.OnClickListener
return false; return false;
} else { } else {
exitLasttime = System.currentTimeMillis(); exitLasttime = System.currentTimeMillis();
Toast.makeText(getContext(), R.string.back_tip, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(R.string.back_tip);
} }
} }
if (mWebViewPlus.canGoBack() && !homeActivity.fragment_mycard_chatting_room.isVisible()) { if (mWebViewPlus.canGoBack() && !homeActivity.fragment_mycard_chatting_room.isVisible()) {
...@@ -440,7 +440,7 @@ public class MycardFragment extends BaseFragemnt implements View.OnClickListener ...@@ -440,7 +440,7 @@ public class MycardFragment extends BaseFragemnt implements View.OnClickListener
if (mMcUser.getUsername() != null && mMcUser.getPassword() != null) { if (mMcUser.getUsername() != null && mMcUser.getPassword() != null) {
serviceManagement.start(); serviceManagement.start();
} else { } else {
Toast.makeText(getActivity(), R.string.login_mycard, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(R.string.login_mycard);
} }
} }
break; break;
......
...@@ -17,53 +17,11 @@ import org.jdeferred.android.AndroidDeferredManager; ...@@ -17,53 +17,11 @@ import org.jdeferred.android.AndroidDeferredManager;
public class VUiKit { public class VUiKit {
private static final AndroidDeferredManager gDM = new AndroidDeferredManager(); private static final AndroidDeferredManager gDM = new AndroidDeferredManager();
private static final Handler gUiHandler = new Handler(Looper.getMainLooper()); private static final Handler gUiHandler = new Handler(Looper.getMainLooper());
private static Toast mToast;
public static AndroidDeferredManager defer() { public static AndroidDeferredManager defer() {
return gDM; return gDM;
} }
public static int dpToPx(Context context, int dp) {
return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp,
context.getResources().getDisplayMetrics());
}
public static int dpToPx(int dp) {
return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp,
Resources.getSystem().getDisplayMetrics());
}
public static int getScreenWidth() {
return Resources.getSystem().getDisplayMetrics().widthPixels;
}
public static int getScreenHeiget() {
return Resources.getSystem().getDisplayMetrics().heightPixels;
}
public static void show(final Context context, int id, Object... args) {
final String str = args.length == 0 ? context.getString(id) : context.getString(id, args);
post(() -> {
if (mToast == null) {
mToast = Toast.makeText(context, str, Toast.LENGTH_SHORT);
} else {
mToast.setText(str);
}
mToast.show();
});
}
public static void show(final Context context, String str) {
post(() -> {
if (mToast == null) {
mToast = Toast.makeText(context, str, Toast.LENGTH_SHORT);
} else {
mToast.setText(str);
}
mToast.show();
});
}
public static void post(Runnable r) { public static void post(Runnable r) {
gUiHandler.post(r); gUiHandler.post(r);
} }
......
...@@ -27,6 +27,7 @@ import cn.garymb.ygomobile.ui.file.FileActivity; ...@@ -27,6 +27,7 @@ import cn.garymb.ygomobile.ui.file.FileActivity;
import cn.garymb.ygomobile.ui.file.FileOpenType; import cn.garymb.ygomobile.ui.file.FileOpenType;
import cn.garymb.ygomobile.utils.CurImageInfo; import cn.garymb.ygomobile.utils.CurImageInfo;
import cn.garymb.ygomobile.utils.FileUtils; import cn.garymb.ygomobile.utils.FileUtils;
import cn.garymb.ygomobile.utils.YGOUtil;
public abstract class PreferenceFragmentPlus extends BasePreferenceFragment { public abstract class PreferenceFragmentPlus extends BasePreferenceFragment {
private Preference curPreference; private Preference curPreference;
...@@ -175,7 +176,7 @@ public abstract class PreferenceFragmentPlus extends BasePreferenceFragment { ...@@ -175,7 +176,7 @@ public abstract class PreferenceFragmentPlus extends BasePreferenceFragment {
try { try {
FileUtils.copyFile(cachePath, mCurImageInfo.mOutFile); FileUtils.copyFile(cachePath, mCurImageInfo.mOutFile);
} catch (IOException e) { } catch (IOException e) {
Toast.makeText(getContext(), e + "", Toast.LENGTH_LONG).show(); YGOUtil.showTextToast(e + "", Toast.LENGTH_LONG);
onChooseFileFail(curPreference); onChooseFileFail(curPreference);
} }
onChooseFileOk(curPreference, mCurImageInfo.mOutFile); onChooseFileOk(curPreference, mCurImageInfo.mOutFile);
......
...@@ -96,6 +96,7 @@ import cn.garymb.ygomobile.utils.OkhttpUtil; ...@@ -96,6 +96,7 @@ import cn.garymb.ygomobile.utils.OkhttpUtil;
import cn.garymb.ygomobile.utils.ServerUtil; import cn.garymb.ygomobile.utils.ServerUtil;
import cn.garymb.ygomobile.utils.SharedPreferenceUtil; import cn.garymb.ygomobile.utils.SharedPreferenceUtil;
import cn.garymb.ygomobile.utils.SystemUtils; import cn.garymb.ygomobile.utils.SystemUtils;
import cn.garymb.ygomobile.utils.YGOUtil;
import cn.garymb.ygomobile.utils.glide.GlideCompat; import cn.garymb.ygomobile.utils.glide.GlideCompat;
import ocgcore.DataManager; import ocgcore.DataManager;
import okhttp3.Call; import okhttp3.Call;
...@@ -243,7 +244,7 @@ public class SettingFragment extends PreferenceFragmentPlus { ...@@ -243,7 +244,7 @@ public class SettingFragment extends PreferenceFragmentPlus {
} }
} }
mSettings.setDataLanguage(Integer.valueOf(listPreference.getValue())); mSettings.setDataLanguage(Integer.valueOf(listPreference.getValue()));
Toast.makeText(getContext(), R.string.restart_app, Toast.LENGTH_LONG).show(); YGOUtil.showTextToast(R.string.restart_app, Toast.LENGTH_LONG);
DataManager.get().load(true); DataManager.get().load(true);
} }
mSharedPreferences.edit().putString(preference.getKey(), listPreference.getValue()).apply(); mSharedPreferences.edit().putString(preference.getKey(), listPreference.getValue()).apply();
...@@ -281,10 +282,10 @@ public class SettingFragment extends PreferenceFragmentPlus { ...@@ -281,10 +282,10 @@ public class SettingFragment extends PreferenceFragmentPlus {
}); });
dialog.show(); dialog.show();
} else { } else {
Toast.makeText(getContext(), R.string.Already_Lastest, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(R.string.Already_Lastest);
} }
} else { } else {
Toast.makeText(getContext(), getString(R.string.Checking_Update_Failed), Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(R.string.Checking_Update_Failed);
} }
break; break;
case TYPE_SETTING_GET_VERSION_FAILED: case TYPE_SETTING_GET_VERSION_FAILED:
...@@ -292,7 +293,7 @@ public class SettingFragment extends PreferenceFragmentPlus { ...@@ -292,7 +293,7 @@ public class SettingFragment extends PreferenceFragmentPlus {
if (FailedCount <= 2) { if (FailedCount <= 2) {
checkUpgrade(URL_HOME_VERSION); checkUpgrade(URL_HOME_VERSION);
} else { } else {
Toast.makeText(getContext(), getString(R.string.Checking_Update_Failed) + msg.obj.toString(), Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(getString(R.string.Checking_Update_Failed) + msg.obj.toString());
} }
break; break;
} }
...@@ -344,7 +345,7 @@ public class SettingFragment extends PreferenceFragmentPlus { ...@@ -344,7 +345,7 @@ public class SettingFragment extends PreferenceFragmentPlus {
simpleListAdapter.notifyDataSetChanged(); simpleListAdapter.notifyDataSetChanged();
FileUtils.delFile(mSettings.getExpansionsPath().getAbsolutePath() + "/" + name); FileUtils.delFile(mSettings.getExpansionsPath().getAbsolutePath() + "/" + name);
DataManager.get().load(true); DataManager.get().load(true);
Toast.makeText(getContext(), R.string.done, Toast.LENGTH_LONG).show(); YGOUtil.showTextToast(R.string.done, Toast.LENGTH_LONG);
if (name.contains(Constants.officialExCardPackageName)) {//如果删除的是官方先行卡ypk,则更新其相关UI状态 if (name.contains(Constants.officialExCardPackageName)) {//如果删除的是官方先行卡ypk,则更新其相关UI状态
SharedPreferenceUtil.setExpansionDataVer(null);//删除先行卡后,更新版本状态 SharedPreferenceUtil.setExpansionDataVer(null);//删除先行卡后,更新版本状态
ServerUtil.exCardState = ServerUtil.ExCardState.NEED_UPDATE; ServerUtil.exCardState = ServerUtil.ExCardState.NEED_UPDATE;
...@@ -572,12 +573,12 @@ public class SettingFragment extends PreferenceFragmentPlus { ...@@ -572,12 +573,12 @@ public class SettingFragment extends PreferenceFragmentPlus {
dlg.dismiss(); dlg.dismiss();
mSettings.setUseExtraCards(false); mSettings.setUseExtraCards(false);
checkBoxPreference.setChecked(false); checkBoxPreference.setChecked(false);
Toast.makeText(getActivity(), R.string.restart_app, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(R.string.restart_app);
}).done((ok) -> { }).done((ok) -> {
dlg.dismiss(); dlg.dismiss();
checkBoxPreference.setChecked(ok); checkBoxPreference.setChecked(ok);
mSettings.setUseExtraCards(ok); mSettings.setUseExtraCards(ok);
Toast.makeText(getActivity(), R.string.restart_app, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(R.string.restart_app);
}); });
} }
...@@ -670,7 +671,7 @@ public class SettingFragment extends PreferenceFragmentPlus { ...@@ -670,7 +671,7 @@ public class SettingFragment extends PreferenceFragmentPlus {
Log.e("SettingFragment", "错误" + e); Log.e("SettingFragment", "错误" + e);
} }
}).done((rs) -> { }).done((rs) -> {
Toast.makeText(getContext(), R.string.done, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(R.string.done);
dialog.dismiss(); dialog.dismiss();
}); });
} }
......
...@@ -23,6 +23,7 @@ import cn.garymb.ygomobile.lite.R; ...@@ -23,6 +23,7 @@ import cn.garymb.ygomobile.lite.R;
import cn.garymb.ygomobile.loader.ImageLoader; import cn.garymb.ygomobile.loader.ImageLoader;
import cn.garymb.ygomobile.ui.cards.deck.ImageTop; import cn.garymb.ygomobile.ui.cards.deck.ImageTop;
import cn.garymb.ygomobile.ui.cards.deck.LabelInfo; import cn.garymb.ygomobile.ui.cards.deck.LabelInfo;
import cn.garymb.ygomobile.utils.YGOUtil;
import ocgcore.data.Card; import ocgcore.data.Card;
import ocgcore.data.LimitList; import ocgcore.data.LimitList;
...@@ -501,13 +502,13 @@ public class DeckGroupView extends FrameLayout implements View.OnClickListener { ...@@ -501,13 +502,13 @@ public class DeckGroupView extends FrameLayout implements View.OnClickListener {
if (EditMode.None != getEditMode()) { if (EditMode.None != getEditMode()) {
if (getEditMode() == EditMode.Main2Side) { if (getEditMode() == EditMode.Main2Side) {
if (type == Type.Side) { if (type == Type.Side) {
Toast.makeText(getContext(), "不能选择side的", Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast("不能选择side的");
return; return;
} }
} }
if (getEditMode() == EditMode.Side2Main) { if (getEditMode() == EditMode.Side2Main) {
if (type == Type.Main || type == Type.Extra) { if (type == Type.Main || type == Type.Extra) {
Toast.makeText(getContext(), "只能选择side的", Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast("只能选择side的");
return; return;
} }
} }
......
...@@ -69,7 +69,7 @@ public class CrashHandler implements Thread.UncaughtExceptionHandler { ...@@ -69,7 +69,7 @@ public class CrashHandler implements Thread.UncaughtExceptionHandler {
@Override @Override
public void run() { public void run() {
Looper.prepare(); Looper.prepare();
Toast.makeText(context, R.string.crashed, Toast.LENGTH_LONG).show(); YGOUtil.showTextToast(context.getString(R.string.crashed), Toast.LENGTH_LONG);
Looper.loop(); Looper.loop();
} }
}.start(); }.start();
......
package cn.garymb.ygomobile.utils;
import android.content.Context;
public class DensityUtils {
/**
* dp转px
*/
public static int dp2px(Context ctx, float dp) {
if(dp == 0){
return 0;
}
float density = ctx.getResources().getDisplayMetrics().density;
int px = Math.round(dp * density);// 4.9->5 4.4->4
return px;
}
public static float px2dp(Context ctx, int px) {
float density = ctx.getResources().getDisplayMetrics().density;
float dp = px / density;
return dp;
}
}
...@@ -240,7 +240,7 @@ public class ScreenUtil { ...@@ -240,7 +240,7 @@ public class ScreenUtil {
public static int getNotchHeightOPPO(Context context) { public static int getNotchHeightOPPO(Context context) {
if (isNotchVivo(context)) { if (isNotchVivo(context)) {
//oppo刘海区域则都是宽度为324px, 高度为80px //oppo刘海区域则都是宽度为324px, 高度为80px
return (int) DensityUtils.px2dp(context, 80); return (int) YGOUtil.px2dp(80);
} }
return 0; return 0;
} }
......
...@@ -33,7 +33,7 @@ public class ShareUtil { ...@@ -33,7 +33,7 @@ public class ShareUtil {
} }
} }
if (!ok) { if (!ok) {
Toast.makeText(context, R.string.no_share_app, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(context.getString(R.string.no_share_app));
} }
return ok; return ok;
} }
...@@ -70,7 +70,7 @@ public class ShareUtil { ...@@ -70,7 +70,7 @@ public class ShareUtil {
} }
} }
if (!ok) { if (!ok) {
Toast.makeText(context, R.string.no_share_app, Toast.LENGTH_SHORT).show(); YGOUtil.showTextToast(R.string.no_share_app);
} }
return ok; return ok;
} }
......
...@@ -5,9 +5,13 @@ import android.content.ClipData; ...@@ -5,9 +5,13 @@ import android.content.ClipData;
import android.content.ClipboardManager; import android.content.ClipboardManager;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.res.Resources;
import android.os.Build; import android.os.Build;
import android.os.Handler;
import android.os.Looper;
import android.util.Log; import android.util.Log;
import android.view.Gravity; import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import android.widget.Toast; import android.widget.Toast;
...@@ -19,19 +23,31 @@ import androidx.recyclerview.widget.RecyclerView; ...@@ -19,19 +23,31 @@ import androidx.recyclerview.widget.RecyclerView;
import com.ourygo.lib.duelassistant.util.PermissionUtil; import com.ourygo.lib.duelassistant.util.PermissionUtil;
import com.ourygo.lib.duelassistant.util.Util; import com.ourygo.lib.duelassistant.util.Util;
import org.jdeferred.android.AndroidDeferredManager;
import java.time.Duration; import java.time.Duration;
import cn.garymb.ygomobile.App; import cn.garymb.ygomobile.App;
import cn.garymb.ygomobile.lite.R; import cn.garymb.ygomobile.lite.R;
import cn.garymb.ygomobile.ui.plus.DialogPlus; import cn.garymb.ygomobile.ui.plus.DialogPlus;
import cn.garymb.ygomobile.ui.plus.VUiKit;
public class YGOUtil { public class YGOUtil {
private static Toast mToast;
//提示 //提示
public static void showTextToast(int resId) {
showTextToast(s(resId));
}
public static void showTextToast(String message) { public static void showTextToast(String message) {
showTextToast(Gravity.BOTTOM, message, Toast.LENGTH_SHORT); showTextToast(Gravity.BOTTOM, message, Toast.LENGTH_SHORT);
} }
public static void showTextToast(int resId, int duration) {
showTextToast(s(resId), duration);
}
public static void showTextToast(String message, int duration) { public static void showTextToast(String message, int duration) {
showTextToast(Gravity.BOTTOM, message, duration); showTextToast(Gravity.BOTTOM, message, duration);
} }
...@@ -40,11 +56,47 @@ public class YGOUtil { ...@@ -40,11 +56,47 @@ public class YGOUtil {
showTextToast(gravity, message, Toast.LENGTH_SHORT); showTextToast(gravity, message, Toast.LENGTH_SHORT);
} }
public static void showTextToast(int gravity, int resId, int duration) {
showTextToast(gravity, s(resId), duration);
}
public static void showTextToast(int gravity, String message, int duration) { public static void showTextToast(int gravity, String message, int duration) {
Toast toast = Toast.makeText(App.get(), message, duration); mToast = Toast.makeText(App.get(), message, duration);
toast.setGravity(gravity,0, 0); mToast.setGravity(gravity,0, 0);
toast.setText(message); mToast.setText(message);
toast.show(); mToast.show();
}
public static void show(int id, Object... args) {
Context context = App.get();
final String str = args.length == 0 ? context.getString(id) : context.getString(id, args);
VUiKit.post(() -> {
if (mToast == null) {
showTextToast(str);
} else {
mToast.setText(str);
}
mToast.show();
});
}
public static void show(String str) {
VUiKit.post(() -> {
if (mToast == null) {
showTextToast(str);
} else {
mToast.setText(str);
}
mToast.show();
});
}
public static int getScreenWidth() {
return Resources.getSystem().getDisplayMetrics().widthPixels;
}
public static int getScreenHeiget() {
return Resources.getSystem().getDisplayMetrics().heightPixels;
} }
public static int c(int colorId) { public static int c(int colorId) {
...@@ -175,7 +227,23 @@ public class YGOUtil { ...@@ -175,7 +227,23 @@ public class YGOUtil {
return dialog; return dialog;
} }
/**
* dp转px
*/
public static int dp2px(float dp) {
if(dp == 0){
return 0;
}
float density = App.get().getResources().getDisplayMetrics().density;
int px = Math.round(dp * density);// 4.9->5 4.4->4
return px;
}
public static float px2dp(int px) {
float density = App.get().getResources().getDisplayMetrics().density;
float dp = px / density;
return dp;
}
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment