diff --git a/DialogX/src/main/java/com/kongzue/dialogx/dialogs/BottomMenu.java b/DialogX/src/main/java/com/kongzue/dialogx/dialogs/BottomMenu.java
index 110a476..c4c7c36 100644
--- a/DialogX/src/main/java/com/kongzue/dialogx/dialogs/BottomMenu.java
+++ b/DialogX/src/main/java/com/kongzue/dialogx/dialogs/BottomMenu.java
@@ -501,11 +501,6 @@ public class BottomMenu extends BottomDialog {
public void down(MotionEvent event) {
curTouchY = dialog.bkg.getY();
}
-
- @Override
- public void move(MotionEvent event) {
- curTouchY = event.getRawY();
- }
});
listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
diff --git a/DialogX/src/main/java/com/kongzue/dialogx/util/views/BottomDialogListView.java b/DialogX/src/main/java/com/kongzue/dialogx/util/views/BottomDialogListView.java
index c4ce2a5..556a2d0 100644
--- a/DialogX/src/main/java/com/kongzue/dialogx/util/views/BottomDialogListView.java
+++ b/DialogX/src/main/java/com/kongzue/dialogx/util/views/BottomDialogListView.java
@@ -71,26 +71,25 @@ public class BottomDialogListView extends ListView {
if (bottomMenuListViewTouchEvent != null) {
bottomMenuListViewTouchEvent.down(ev);
}
- mPosition = pointToPosition((int) ev.getX(), (int) ev.getY());
- return super.dispatchTouchEvent(ev);
+ /*mPosition = pointToPosition((int) ev.getX(), (int) ev.getY());
+ return super.dispatchTouchEvent(ev);*/
}
if (actionMasked == MotionEvent.ACTION_MOVE) {
if (bottomMenuListViewTouchEvent != null) {
bottomMenuListViewTouchEvent.move(ev);
}
- return true;
+ /*setPressed(pointToPosition((int) ev.getX(), (int) ev.getY()) == mPosition);
+ invalidate();
+ return true;*/
}
if (actionMasked == MotionEvent.ACTION_UP || actionMasked == MotionEvent.ACTION_CANCEL) {
if (bottomMenuListViewTouchEvent != null) {
bottomMenuListViewTouchEvent.up(ev);
}
- if (pointToPosition((int) ev.getX(), (int) ev.getY()) == mPosition) {
- super.dispatchTouchEvent(ev);
- } else {
- setPressed(false);
- invalidate();
- }
+ /*if (pointToPosition((int) ev.getX(), (int) ev.getY()) != mPosition) {
+ return true;
+ }*/
}
return super.dispatchTouchEvent(ev);
diff --git a/DialogX/src/main/res/drawable/button_dialogx_miui_gray.xml b/DialogX/src/main/res/drawable/button_dialogx_miui_gray.xml
new file mode 100644
index 0000000..30fec5e
--- /dev/null
+++ b/DialogX/src/main/res/drawable/button_dialogx_miui_gray.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/DialogX/src/main/res/drawable/button_dialogx_miui_gray_night.xml b/DialogX/src/main/res/drawable/button_dialogx_miui_gray_night.xml
new file mode 100644
index 0000000..6577554
--- /dev/null
+++ b/DialogX/src/main/res/drawable/button_dialogx_miui_gray_night.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/DialogX/src/main/res/drawable/rect_dialogx_miui_bkg_light.xml b/DialogX/src/main/res/drawable/rect_dialogx_miui_bkg_light.xml
new file mode 100644
index 0000000..cbfdb50
--- /dev/null
+++ b/DialogX/src/main/res/drawable/rect_dialogx_miui_bkg_light.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
diff --git a/DialogX/src/main/res/drawable/rect_dialogx_miui_bkg_night.xml b/DialogX/src/main/res/drawable/rect_dialogx_miui_bkg_night.xml
new file mode 100644
index 0000000..34584b3
--- /dev/null
+++ b/DialogX/src/main/res/drawable/rect_dialogx_miui_bkg_night.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
diff --git a/DialogX/src/main/res/drawable/rect_dialogx_miui_button_gray_normal.xml b/DialogX/src/main/res/drawable/rect_dialogx_miui_button_gray_normal.xml
new file mode 100644
index 0000000..9516c1f
--- /dev/null
+++ b/DialogX/src/main/res/drawable/rect_dialogx_miui_button_gray_normal.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/DialogX/src/main/res/drawable/rect_dialogx_miui_button_gray_normal_night.xml b/DialogX/src/main/res/drawable/rect_dialogx_miui_button_gray_normal_night.xml
new file mode 100644
index 0000000..3689f9a
--- /dev/null
+++ b/DialogX/src/main/res/drawable/rect_dialogx_miui_button_gray_normal_night.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/DialogX/src/main/res/drawable/rect_dialogx_miui_button_gray_press.xml b/DialogX/src/main/res/drawable/rect_dialogx_miui_button_gray_press.xml
new file mode 100644
index 0000000..20fd79f
--- /dev/null
+++ b/DialogX/src/main/res/drawable/rect_dialogx_miui_button_gray_press.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/DialogX/src/main/res/drawable/rect_dialogx_miui_button_gray_press_night.xml b/DialogX/src/main/res/drawable/rect_dialogx_miui_button_gray_press_night.xml
new file mode 100644
index 0000000..fac0a17
--- /dev/null
+++ b/DialogX/src/main/res/drawable/rect_dialogx_miui_button_gray_press_night.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/DialogX/src/main/res/layout/layout_dialogx_bottom_material.xml b/DialogX/src/main/res/layout/layout_dialogx_bottom_material.xml
index 3649d43..e5613a4 100644
--- a/DialogX/src/main/res/layout/layout_dialogx_bottom_material.xml
+++ b/DialogX/src/main/res/layout/layout_dialogx_bottom_material.xml
@@ -44,6 +44,7 @@
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:paddingBottom="10dp"
+ android:paddingTop="3dp"
android:text="Title"
android:textColor="@color/black"
android:textSize="21dp" />
@@ -89,68 +90,20 @@
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_height="50dp"
+ android:layout_marginLeft="26dp"
+ android:layout_marginTop="10dp"
+ android:layout_marginRight="26dp"
+ android:layout_marginBottom="20dp"
+ android:background="@drawable/button_dialogx_miui_gray"
+ android:clickable="true"
+ android:gravity="center"
+ android:tag="cancel"
+ android:text="取消"
+ android:textColor="@color/black80"
+ android:textSize="16dp" />
diff --git a/DialogX/src/main/res/layout/layout_dialogx_bottom_material_dark.xml b/DialogX/src/main/res/layout/layout_dialogx_bottom_material_dark.xml
index 59311e6..e56bd7c 100644
--- a/DialogX/src/main/res/layout/layout_dialogx_bottom_material_dark.xml
+++ b/DialogX/src/main/res/layout/layout_dialogx_bottom_material_dark.xml
@@ -16,7 +16,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
- android:background="@drawable/rect_dialogx_material_bottom_bkg_night"
+ android:background="@drawable/rect_dialogx_miui_bkg_night"
android:clickable="true"
android:focusableInTouchMode="true">
@@ -44,8 +44,9 @@
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:paddingBottom="10dp"
+ android:paddingTop="3dp"
android:text="Title"
- android:textColor="@color/white"
+ android:textColor="@color/dialogxMIUITextDark"
android:textSize="21dp" />
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_height="50dp"
+ android:layout_marginLeft="26dp"
+ android:layout_marginTop="10dp"
+ android:layout_marginRight="26dp"
+ android:layout_marginBottom="20dp"
+ android:background="@drawable/button_dialogx_miui_gray_night"
+ android:clickable="true"
+ android:gravity="center"
+ android:tag="cancel"
+ android:text="取消"
+ android:textColor="@color/dialogxMIUITextDark"
+ android:textSize="16dp" />
diff --git a/DialogX/src/main/res/values/colors.xml b/DialogX/src/main/res/values/colors.xml
index dd3c440..f4a3882 100644
--- a/DialogX/src/main/res/values/colors.xml
+++ b/DialogX/src/main/res/values/colors.xml
@@ -37,4 +37,23 @@
#232323
#86B3D6
+
+
+
+ #222224
+ #0C84FF
+ #EDEDED
+ #141414
+ #F0F0F0
+ #DCDCDC
+ #0C84FF
+ #096CD1
+ #606060
+ #D3D3D3
+ #0062BC
+ #096CD1
+ #333335
+ #29292B
+ #1A0C84FF
+ #6282BA
\ No newline at end of file
diff --git a/app/src/main/assets/updatelog.fy b/app/src/main/assets/updatelog.fy
index 49161ed..317c7f8 100644
--- a/app/src/main/assets/updatelog.fy
+++ b/app/src/main/assets/updatelog.fy
@@ -1,3 +1,10 @@
+2021.06.03
+风月读书v2.0.7
+更新内容:
+1、修复进入私密书架分组后书架书籍未改变的问题
+2、修复部分机型底部菜单无法点击的问题
+3、底部对话框按钮优化
+
2021.06.02
风月读书v2.0.6
更新内容:
diff --git a/app/src/main/java/xyz/fycz/myreader/ui/activity/MainActivity.java b/app/src/main/java/xyz/fycz/myreader/ui/activity/MainActivity.java
index 51163db..fbef284 100644
--- a/app/src/main/java/xyz/fycz/myreader/ui/activity/MainActivity.java
+++ b/app/src/main/java/xyz/fycz/myreader/ui/activity/MainActivity.java
@@ -484,7 +484,7 @@ public class MainActivity extends BaseActivity {
if (mBookcaseFragment.isRecreate()) {
reLoadFragment();
}
- mBookcaseFragment.onResume();
+ mBookcaseFragment.init();
}
/**
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 3e3693f..68b2630 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
@@ -1608,7 +1608,7 @@ public class ReadActivity extends BaseActivity implements ColorPickerDialogListe
public void onOneItemSelect(BottomMenu dialog, CharSequence text, int which) {
selectedIndex = which;
}
- }).setOkButton("确定", (baseDialog, v) -> {
+ }).setCancelButton("确定", (baseDialog, v) -> {
switch (selectedIndex) {
case 0:
addDownload(mPageLoader.getChapterPos(), mPageLoader.getChapterPos() + 50);
@@ -1624,7 +1624,7 @@ public class ReadActivity extends BaseActivity implements ColorPickerDialogListe
break;
}
return false;
- }).setCancelButton(R.string.cancel);
+ });
});
}
diff --git a/app/src/main/java/xyz/fycz/myreader/ui/adapter/BookcaseAdapter.java b/app/src/main/java/xyz/fycz/myreader/ui/adapter/BookcaseAdapter.java
index caf0d85..f458cd7 100644
--- a/app/src/main/java/xyz/fycz/myreader/ui/adapter/BookcaseAdapter.java
+++ b/app/src/main/java/xyz/fycz/myreader/ui/adapter/BookcaseAdapter.java
@@ -323,7 +323,7 @@ public abstract class BookcaseAdapter extends RecyclerView.Adapter {
+ }).setCancelButton("确定", (baseDialog, v) -> {
switch (selectedIndex) {
case 0:
begin[0] = book.getHisttoryChapterNum();
@@ -348,7 +348,7 @@ public abstract class BookcaseAdapter extends RecyclerView.Adapter
+ android:paddingBottom="10dp">
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_bookcase.xml b/app/src/main/res/layout/fragment_bookcase.xml
deleted file mode 100644
index 094e83d..0000000
--- a/app/src/main/res/layout/fragment_bookcase.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-