From 60d5bb768ca9cb50561d6f85b549342fd9eb1f65 Mon Sep 17 00:00:00 2001
From: fengyuecanzhu <1021300691@qq.com>
Date: Sun, 27 Jun 2021 20:54:55 +0800
Subject: [PATCH] fix bug

---
 .idea/caches/build_file_checksums.ser         | Bin 0 -> 585 bytes
 .../kongzue/dialogx/style/MaterialStyle.java  |   2 +-
 .../BottomDialogTouchEventInterceptor.java    |   5 +-
 .../myreader/ui/activity/ReadActivity.java    |   5 +-
 .../myreader/ui/dialog/CopyContentDialog.java |  60 ------------------
 .../myreader/ui/dialog/MyAlertDialog.java     |  11 ++++
 .../fycz/myreader/widget/page/PageLoader.java |   2 +-
 .../main/res/layout/dialog_copy_content.xml   |  16 -----
 8 files changed, 20 insertions(+), 81 deletions(-)
 create mode 100644 .idea/caches/build_file_checksums.ser
 delete mode 100644 app/src/main/java/xyz/fycz/myreader/ui/dialog/CopyContentDialog.java
 delete mode 100644 app/src/main/res/layout/dialog_copy_content.xml

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
new file mode 100644
index 0000000000000000000000000000000000000000..f91cdfc49b06ac1995bfa56ac62b82223d703ca3
GIT binary patch
literal 585
zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2
zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}<i#MFTj`TnT;dMa8(f)}9Fm!vT3nKt
zTj0aMpIeEdv4nx&Co8cmQNOe#Ge_SyvB0{bfPsOr%D2<(D$remAUQpdoSsKwaRyMH
zmHpPi!(s^+nHiYe7`Srs6I0w0lS}f8JQ+AkGKx}*GxBp%Dhli!7(jrhoC8P-05Lnz
zqT<w&lFYpHVyLf5ix`-qoz{F7|G~x)@_>nf0c10SK=O;~lkaUMu4O+hGCKX^#l;c^
z5tq!woc#0%{UngTVY&+$>KNES8aB*-xA1<6`uC#;mDa8BU|mtdz=K_(=@gr9bGJqH
zyb3sXMB&ZvIVB7NIr+(nIiTPzNG&SKOf4>jn_4b$sW)AT>-pC3aOtKb*M%hv>iQY^
zxvBbTsd?#@rK$Q*cjzOc2*ZpkvOPEZ88)%JY~Y;n=7&>V34<UW)sq(1E6ys~XL9ZE
krpQY#*C+y=msn7M!_%ubO}!HFTWhb2e%n%+<T#lM02qwYS^xk5

literal 0
HcmV?d00001

diff --git a/DialogX/src/main/java/com/kongzue/dialogx/style/MaterialStyle.java b/DialogX/src/main/java/com/kongzue/dialogx/style/MaterialStyle.java
index d7936ce..5a4ef66 100644
--- a/DialogX/src/main/java/com/kongzue/dialogx/style/MaterialStyle.java
+++ b/DialogX/src/main/java/com/kongzue/dialogx/style/MaterialStyle.java
@@ -141,7 +141,7 @@ public class MaterialStyle implements DialogXStyle {
             
             @Override
             public boolean touchSlide() {
-                return true;
+                return false;
             }
             
             @Override
diff --git a/DialogX/src/main/java/com/kongzue/dialogx/util/BottomDialogTouchEventInterceptor.java b/DialogX/src/main/java/com/kongzue/dialogx/util/BottomDialogTouchEventInterceptor.java
index 1ce5f56..8025e3f 100644
--- a/DialogX/src/main/java/com/kongzue/dialogx/util/BottomDialogTouchEventInterceptor.java
+++ b/DialogX/src/main/java/com/kongzue/dialogx/util/BottomDialogTouchEventInterceptor.java
@@ -1,6 +1,7 @@
 package com.kongzue.dialogx.util;
 
 import android.animation.ObjectAnimator;
+import android.annotation.SuppressLint;
 import android.content.res.Resources;
 import android.util.Log;
 import android.view.MotionEvent;
@@ -42,7 +43,8 @@ public class BottomDialogTouchEventInterceptor {
     public BottomDialogTouchEventInterceptor(BottomDialog me, BottomDialog.DialogImpl impl) {
         refresh(me, impl);
     }
-    
+
+    @SuppressLint("ClickableViewAccessibility")
     public void refresh(final BottomDialog me, final BottomDialog.DialogImpl impl) {
         if (me == null || impl == null || impl.bkg == null || impl.scrollView == null) {
             return;
@@ -62,6 +64,7 @@ public class BottomDialogTouchEventInterceptor {
          */
         if (me.isAllowInterceptTouch()) {
             impl.bkg.setOnTouchListener(new View.OnTouchListener() {
+
                 @Override
                 public boolean onTouch(View v, MotionEvent event) {
                     //这里 return 什么实际上无关紧要，重点在于 MaxRelativeLayout.java(dispatchTouchEvent:184) 的事件分发会独立触发此处的额外滑动事件
diff --git a/app/src/main/java/xyz/fycz/myreader/ui/activity/ReadActivity.java b/app/src/main/java/xyz/fycz/myreader/ui/activity/ReadActivity.java
index f736b91..5c6e9b9 100644
--- a/app/src/main/java/xyz/fycz/myreader/ui/activity/ReadActivity.java
+++ b/app/src/main/java/xyz/fycz/myreader/ui/activity/ReadActivity.java
@@ -81,8 +81,8 @@ import xyz.fycz.myreader.model.audio.ReadAloudService;
 import xyz.fycz.myreader.model.sourceAnalyzer.BookSourceManager;
 import xyz.fycz.myreader.model.storage.Backup;
 import xyz.fycz.myreader.ui.dialog.AudioPlayerDialog;
-import xyz.fycz.myreader.ui.dialog.CopyContentDialog;
 import xyz.fycz.myreader.ui.dialog.DialogCreator;
+import xyz.fycz.myreader.ui.dialog.MyAlertDialog;
 import xyz.fycz.myreader.ui.dialog.ReplaceDialog;
 import xyz.fycz.myreader.ui.dialog.SourceExchangeDialog;
 import xyz.fycz.myreader.ui.popmenu.AutoPageMenu;
@@ -759,7 +759,8 @@ public class ReadActivity extends BaseActivity implements ColorPickerDialogListe
             Intent ruleIntent = new Intent(this, ReplaceRuleActivity.class);
             startActivityForResult(ruleIntent, APPCONST.REQUEST_REFRESH_READ_UI);
         } else if (itemId == R.id.action_copy_content) {
-            new CopyContentDialog(this, mPageLoader.getContent()).show();
+            String content = mPageLoader.getContentStartPage(0);
+            MyAlertDialog.showTipDialogWithLink(this, "拷贝内容", content == null ? "章节内容为空！" : content);
         } else if (itemId == R.id.action_open_link) {
             Uri uri = Uri.parse(NetworkUtils.getAbsoluteURL(mReadCrawler.getNameSpace(), mBook.getChapterUrl()));
             Intent intent = new Intent(Intent.ACTION_VIEW, uri);
diff --git a/app/src/main/java/xyz/fycz/myreader/ui/dialog/CopyContentDialog.java b/app/src/main/java/xyz/fycz/myreader/ui/dialog/CopyContentDialog.java
deleted file mode 100644
index 1cdfda5..0000000
--- a/app/src/main/java/xyz/fycz/myreader/ui/dialog/CopyContentDialog.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package xyz.fycz.myreader.ui.dialog;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.os.Bundle;
-import android.view.Gravity;
-import android.view.Window;
-import android.view.WindowManager;
-
-import androidx.annotation.NonNull;
-
-import xyz.fycz.myreader.databinding.DialogCopyContentBinding;
-
-/**
- * Created by Zhouas666 on 2019-04-14
- * Github: https://github.com/zas023
- * <p>
- * 自由复制dialog
- */
-
-public class CopyContentDialog extends Dialog {
-
-    private static final String TAG = "CopyContentDialog";
-
-    private DialogCopyContentBinding binding;
-
-    private String content;
-
-    /***************************************************************************/
-
-    public CopyContentDialog(@NonNull Context context, String content) {
-        super(context);
-        this.content = content;
-    }
-
-    /*****************************Initialization********************************/
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        binding = DialogCopyContentBinding.inflate(getLayoutInflater());
-        setContentView(binding.getRoot());
-
-        setUpWindow();
-
-        binding.dialogTvContent.setText(content);
-    }
-
-    /**
-     * 设置Dialog显示的位置
-     */
-    private void setUpWindow() {
-        Window window = getWindow();
-        WindowManager.LayoutParams lp = window.getAttributes();
-        lp.width = WindowManager.LayoutParams.MATCH_PARENT;
-        lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
-        lp.gravity = Gravity.CENTER;
-        window.setAttributes(lp);
-    }
-
-}
diff --git a/app/src/main/java/xyz/fycz/myreader/ui/dialog/MyAlertDialog.java b/app/src/main/java/xyz/fycz/myreader/ui/dialog/MyAlertDialog.java
index 258b6bc..2bcd798 100644
--- a/app/src/main/java/xyz/fycz/myreader/ui/dialog/MyAlertDialog.java
+++ b/app/src/main/java/xyz/fycz/myreader/ui/dialog/MyAlertDialog.java
@@ -325,6 +325,17 @@ public class MyAlertDialog {
         }).setCancelButton("知道了");
     }
 
+    public static void showTipDialogWithLink(Context context, String title, String msg){
+        BottomDialog.show(title, new OnBindView<BottomDialog>(R.layout.dialog_textview) {
+            @Override
+            public void onBind(BottomDialog dialog, View v) {
+                TextView view = (TextView) v;
+                view.setText(msg);
+                view.setMovementMethod(LinkMovementMethod.getInstance());
+            }
+        }).setCancelButton("取消");
+    }
+
     public static void showPrivacyDialog(Context context, DialogInterface.OnClickListener pos, DialogInterface.OnClickListener neg) {
         TextView view = (TextView) LayoutInflater.from(context).inflate(R.layout.dialog_textview, null);
         String msg = context.getString(R.string.privacy_tip);
diff --git a/app/src/main/java/xyz/fycz/myreader/widget/page/PageLoader.java b/app/src/main/java/xyz/fycz/myreader/widget/page/PageLoader.java
index c78a20d..fd2f0e9 100644
--- a/app/src/main/java/xyz/fycz/myreader/widget/page/PageLoader.java
+++ b/app/src/main/java/xyz/fycz/myreader/widget/page/PageLoader.java
@@ -2017,7 +2017,7 @@ public abstract class PageLoader {
      * @param page 开始页数
      * @return 从page页开始的的当前章节所有内容
      */
-    private String getContentStartPage(int page) {
+    public String getContentStartPage(int page) {
         if (mCurChapter == null) return null;
         if (mCurChapter.getTxtPageList().isEmpty()) return null;
         StringBuilder s = new StringBuilder();
diff --git a/app/src/main/res/layout/dialog_copy_content.xml b/app/src/main/res/layout/dialog_copy_content.xml
deleted file mode 100644
index 07ce353..0000000
--- a/app/src/main/res/layout/dialog_copy_content.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/dialog_tv_content"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textIsSelectable="true"
-        android:textColor="@color/textSecondary"
-        android:textSize="@dimen/text_normal_size"
-        android:text="神墓（辰东）"/>
-
-</LinearLayout>