修复安卓5闪退bug

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

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));

app/src/main/java/xyz/fycz/myreader/ui/adapter/FontsAdapter.java

@@ -117,16 +117,16 @@ public class FontsAdapter extends ArrayAdapter<Font> {
         //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<Font> {
 
         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<Font> {
         } 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);

app/src/main/res/layout/layout_about_content.xml

@@ -78,6 +78,7 @@
                             android:src="@mipmap/ic_avatar_fycz"/>
 
                     <TextView
+                            android:layout_marginTop="12dp"
                             android:id="@+id/fycz"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -87,14 +88,6 @@
                             android:textColor="@color/textSecondary"
                             tools:ignore="HardcodedText"/>
 
-                    <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_below="@id/fycz"
-                            android:layout_toEndOf="@id/ig_avatar_fycz"
-                            android:text="@string/email"
-                            android:textColor="@color/textSecondary"/>
-
                 </RelativeLayout>
             </LinearLayout>
         </androidx.cardview.widget.CardView>

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