diff --git a/app/build.gradle b/app/build.gradle
index b086b24b6..442e49975 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -104,7 +104,6 @@ android {
}
google {
dimension "mode"
- minSdk 26
applicationId "io.legado.play"
manifestPlaceholders.put("APP_CHANNEL_VALUE", "google")
}
diff --git a/app/src/main/java/io/legado/app/ui/book/group/GroupEditDialog.kt b/app/src/main/java/io/legado/app/ui/book/group/GroupEditDialog.kt
index 70845cd3e..c36d77547 100644
--- a/app/src/main/java/io/legado/app/ui/book/group/GroupEditDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/book/group/GroupEditDialog.kt
@@ -60,8 +60,9 @@ class GroupEditDialog() : BaseDialogFragment(R.layout.dialog_book_group_edit) {
bookGroup?.let {
binding.btnDelete.visible(it.groupId > 0 || it.groupId == Long.MIN_VALUE)
binding.tieGroupName.setText(it.groupName)
- binding.spSort.setSelection(it.bookSort + 1)
binding.ivCover.load(it.cover)
+ binding.spSort.setSelection(it.bookSort + 1)
+ binding.cbEnableRefresh.isChecked = it.enableRefresh
} ?: let {
binding.toolBar.title = getString(R.string.add_group)
binding.btnDelete.gone()
@@ -79,15 +80,24 @@ class GroupEditDialog() : BaseDialogFragment(R.layout.dialog_book_group_edit) {
if (groupName.isNullOrEmpty()) {
toastOnUi("分组名称不能为空")
} else {
+ val bookSort = binding.spSort.selectedItemPosition - 1
+ val coverPath = binding.ivCover.bitmapPath
+ val enableRefresh = binding.cbEnableRefresh.isChecked
bookGroup?.let {
it.groupName = groupName
- it.cover = binding.ivCover.bitmapPath
- it.bookSort = binding.spSort.selectedItemPosition - 1
+ it.cover = coverPath
+ it.bookSort = bookSort
+ it.enableRefresh = enableRefresh
viewModel.upGroup(it) {
dismiss()
}
} ?: let {
- viewModel.addGroup(groupName, binding.ivCover.bitmapPath) {
+ viewModel.addGroup(
+ groupName,
+ bookSort,
+ enableRefresh,
+ coverPath
+ ) {
dismiss()
}
}
diff --git a/app/src/main/java/io/legado/app/ui/book/group/GroupViewModel.kt b/app/src/main/java/io/legado/app/ui/book/group/GroupViewModel.kt
index d0471e969..ea535aa72 100644
--- a/app/src/main/java/io/legado/app/ui/book/group/GroupViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/group/GroupViewModel.kt
@@ -15,13 +15,21 @@ class GroupViewModel(application: Application) : BaseViewModel(application) {
}
}
- fun addGroup(groupName: String, cover: String?, finally: () -> Unit) {
+ fun addGroup(
+ groupName: String,
+ bookSort: Int,
+ enableRefresh: Boolean,
+ cover: String?,
+ finally: () -> Unit
+ ) {
execute {
val groupId = appDb.bookGroupDao.getUnusedId()
val bookGroup = BookGroup(
groupId = groupId,
groupName = groupName,
cover = cover,
+ bookSort = bookSort,
+ enableRefresh = enableRefresh,
order = appDb.bookGroupDao.maxOrder.plus(1)
)
appDb.bookGroupDao.getByID(groupId) ?: appDb.bookDao.removeGroup(groupId)
diff --git a/app/src/main/res/layout/dialog_book_group_edit.xml b/app/src/main/res/layout/dialog_book_group_edit.xml
index 2b8436b85..814096010 100644
--- a/app/src/main/res/layout/dialog_book_group_edit.xml
+++ b/app/src/main/res/layout/dialog_book_group_edit.xml
@@ -1,10 +1,10 @@
-
+ android:orientation="vertical">
-
-
-
-
+ android:background="@color/background_menu">
-
+
+
+
-
+ android:layout_margin="6dp"
+ android:hint="@string/group_name"
+ app:layout_constraintBottom_toTopOf="@+id/tv_sort"
+ app:layout_constraintLeft_toRightOf="@+id/iv_cover"
+ app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
-
+
+
+
+
+
+
+
+
+
+
+
+ android:orientation="horizontal"
+ android:gravity="center_vertical">
-
+
-
+
-
+
-
+
-
\ No newline at end of file
+
+
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 72f016378..250ff8e14 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -1090,4 +1090,5 @@
文件管理
管理私有文件夹的文件
创建文件夹
+ 允许下拉刷新
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 695b7ae4f..26dd3e79e 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -1093,4 +1093,5 @@
文件管理
管理私有文件夹的文件
创建文件夹
+ 允许下拉刷新
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 3a9ac277e..f35a26488 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1093,4 +1093,5 @@
文件管理
管理私有文件夹的文件
创建文件夹
+ 允许下拉刷新
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 191886896..41f02d108 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -1090,4 +1090,5 @@
文件管理
管理私有文件夹的文件
创建文件夹
+ 允许下拉刷新
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 9936d9ee5..f7a778205 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1092,4 +1092,5 @@
文件管理
管理私有文件夹的文件
创建文件夹
+ 允许下拉刷新
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 99f11c409..7159a4b80 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -1092,4 +1092,5 @@
文件管理
管理私有文件夹的文件
创建文件夹
+ 允许下拉刷新
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7ded50211..5a4638ab6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1093,4 +1093,5 @@
文件管理
管理私有文件夹的文件
创建文件夹
+ 允许下拉刷新