diff --git a/app/src/main/assets/updatelog.fy b/app/src/main/assets/updatelog.fy index 83f4ba2..5601be8 100644 --- a/app/src/main/assets/updatelog.fy +++ b/app/src/main/assets/updatelog.fy @@ -1,5 +1,5 @@ 2020.11.08 -风月读书v1.20.1110811 +风月读书v1.20.1110816 1、修复安卓5闪退bug 2020.11.03 diff --git a/app/src/main/java/xyz/fycz/myreader/ui/activity/AboutActivity.java b/app/src/main/java/xyz/fycz/myreader/ui/activity/AboutActivity.java index f1551c1..f9275a5 100644 --- a/app/src/main/java/xyz/fycz/myreader/ui/activity/AboutActivity.java +++ b/app/src/main/java/xyz/fycz/myreader/ui/activity/AboutActivity.java @@ -61,14 +61,14 @@ public class AboutActivity extends BaseActivity { protected void initClick() { super.initClick(); ClipboardManager mClipboardManager = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE); - vmAuthor.setOnClickListener(v -> { + /*vmAuthor.setOnClickListener(v -> { //数据 ClipData mClipData = ClipData.newPlainText("Label", "fy@fycz.xyz"); //把数据设置到剪切板上 assert mClipboardManager != null; mClipboardManager.setPrimaryClip(mClipData); ToastUtils.showSuccess("邮箱复制成功!"); - }); + });*/ vmShare.setOnClickListener(v -> ShareUtils.share(this, getString(R.string.share_text) + SharedPreUtils.getInstance().getString(getString(R.string.downloadLink, URLCONST.LAN_ZOUS_URL)))); vmUpdate.setOnClickListener(v -> MyApplication.checkVersionByServer(this, true, null)); diff --git a/app/src/main/java/xyz/fycz/myreader/ui/adapter/FontsAdapter.java b/app/src/main/java/xyz/fycz/myreader/ui/adapter/FontsAdapter.java index a21d8f8..1c31672 100644 --- a/app/src/main/java/xyz/fycz/myreader/ui/adapter/FontsAdapter.java +++ b/app/src/main/java/xyz/fycz/myreader/ui/adapter/FontsAdapter.java @@ -117,16 +117,16 @@ public class FontsAdapter extends ArrayAdapter { //viewHolder.tvExample.setTypeface(typeFace); // viewHolder.tvExample.setTypeface(mTypefaceMap.get(font)); viewHolder.tvFontName.setText(font.toString()); - viewHolder.tvFontName.setTextColor(mFontsActivity.getColor(R.color.textPrimary)); + viewHolder.tvFontName.setTextColor(mFontsActivity.getResources().getColor(R.color.textPrimary)); File fontFile = new File(APPCONST.FONT_BOOK_DIR + font.fileName); if (font == Font.本地字体) { if (setting.getFont() == Font.本地字体) { viewHolder.tvFontName.setText(setting.getLocalFontName()); viewHolder.btnFontUse.setText(getContext().getString(R.string.font_change)); - viewHolder.btnFontUse.setButtonColor(mFontsActivity.getColor(R.color.toast_blue)); + viewHolder.btnFontUse.setButtonColor(mFontsActivity.getResources().getColor(R.color.toast_blue)); } else { viewHolder.btnFontUse.setText(getContext().getString(R.string.font_select)); - viewHolder.btnFontUse.setButtonColor(mFontsActivity.getColor(R.color.sys_blue_littler)); + viewHolder.btnFontUse.setButtonColor(mFontsActivity.getResources().getColor(R.color.sys_blue_littler)); } viewHolder.btnFontUse.setEnabled(true); viewHolder.btnFontUse.setOnClickListener(new View.OnClickListener() { @@ -175,7 +175,7 @@ public class FontsAdapter extends ArrayAdapter { if (font != Font.默认字体 && !fontFile.exists()) { viewHolder.btnFontUse.setEnabled(true); - viewHolder.btnFontUse.setButtonColor(mFontsActivity.getColor(R.color.sys_blue_littler)); + viewHolder.btnFontUse.setButtonColor(mFontsActivity.getResources().getColor(R.color.sys_blue_littler)); viewHolder.btnFontUse.setText(getContext().getString(R.string.font_download)); viewHolder.btnFontUse.setOnClickListener(v -> { viewHolder.btnFontUse.setEnabled(false); @@ -184,11 +184,11 @@ public class FontsAdapter extends ArrayAdapter { } else if (setting.getFont() == font) { viewHolder.btnFontUse.setText(getContext().getString(R.string.font_using)); viewHolder.btnFontUse.setEnabled(false); - viewHolder.btnFontUse.setButtonColor(mFontsActivity.getColor(R.color.sys_word_very_little)); + viewHolder.btnFontUse.setButtonColor(mFontsActivity.getResources().getColor(R.color.sys_word_very_little)); } else { viewHolder.btnFontUse.setText(getContext().getString(R.string.font_use)); viewHolder.btnFontUse.setEnabled(true); - viewHolder.btnFontUse.setButtonColor(mFontsActivity.getColor(R.color.toast_blue)); + viewHolder.btnFontUse.setButtonColor(mFontsActivity.getResources().getColor(R.color.toast_blue)); viewHolder.btnFontUse.setOnClickListener(v -> { setting.setFont(font); SysManager.saveSetting(setting); diff --git a/app/src/main/res/layout/layout_about_content.xml b/app/src/main/res/layout/layout_about_content.xml index 2118071..a194c96 100644 --- a/app/src/main/res/layout/layout_about_content.xml +++ b/app/src/main/res/layout/layout_about_content.xml @@ -78,6 +78,7 @@ android:src="@mipmap/ic_avatar_fycz"/> - - diff --git a/app/version_code.properties b/app/version_code.properties index a93756e..b9cb8f7 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Sun Nov 08 11:10:57 CST 2020 +#Sun Nov 08 18:03:05 CST 2020 VERSION_CODE=154