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/DialogX/src/main/res/drawable/rect_dialogx_material_bottom_bkg_light.xml b/DialogX/src/main/res/drawable/rect_dialogx_material_bottom_bkg_light.xml
index e500950..20c28c3 100644
--- a/DialogX/src/main/res/drawable/rect_dialogx_material_bottom_bkg_light.xml
+++ b/DialogX/src/main/res/drawable/rect_dialogx_material_bottom_bkg_light.xml
@@ -6,6 +6,6 @@
android:color="@color/white"/>
+ android:topRightRadius="15dp"
+ android:topLeftRadius="15dp"/>
diff --git a/DialogX/src/main/res/drawable/rect_dialogx_material_bottom_bkg_night.xml b/DialogX/src/main/res/drawable/rect_dialogx_material_bottom_bkg_night.xml
index edc0eaf..b14a6a7 100644
--- a/DialogX/src/main/res/drawable/rect_dialogx_material_bottom_bkg_night.xml
+++ b/DialogX/src/main/res/drawable/rect_dialogx_material_bottom_bkg_night.xml
@@ -6,6 +6,6 @@
android:color="@color/dialogxMaterialDarkDialogBkgColor"/>
+ android:topRightRadius="15dp"
+ android:topLeftRadius="15dp"/>
diff --git a/app/build.gradle b/app/build.gradle
index 5cc5421..2ef7967 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -104,6 +104,7 @@ android {
if (keyPropsFile.exists()) {
signingConfig signingConfigs.myConifg
}
+ versionNameSuffix "-debug"
}
android.applicationVariants.all { variant ->
variant.outputs.all {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ad3c638..64f9cdd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,26 +3,6 @@
xmlns:tools="http://schemas.android.com/tools"
package="xyz.fycz.myreader">
-
-
-
-
-
-
-
-
@@ -84,7 +64,7 @@
- * 自由复制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(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 e214b44..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
@@ -1517,8 +1517,8 @@ public abstract class PageLoader {
private void chapterChangeCallback() {
if (mPageChangeListener != null) {
readAloudParagraph = -1;
- mPageChangeListener.onPageChange(0, resetReadAloud);
mPageChangeListener.onChapterChange(mCurChapterPos);
+ mPageChangeListener.onPageChange(0, resetReadAloud);
resetReadAloud = true;
mPageChangeListener.onPageCountChange(mCurChapter != null ? mCurChapter.getPageSize() : 0);
}
@@ -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 @@
-
-
-
-
-
-