优化

app/src/main/java/io/legado/app/constant/EventBus.kt

@@ -4,6 +4,7 @@ object EventBus {
     const val MEDIA_BUTTON = "mediaButton"
     const val RECREATE = "RECREATE"
     const val UP_BOOK = "upBookToc"
+    const val UP_BOOK_GROUP = "upBookGroup"
     const val ALOUD_STATE = "aloud_state"
     const val TTS_PROGRESS = "ttsStart"
     const val TTS_DS = "ttsDs"

app/src/main/java/io/legado/app/data/AppDatabase.kt

@@ -40,9 +40,16 @@ abstract class AppDatabase: RoomDatabase() {
                     migration_19_20
                 )
                 .allowMainThreadQueries()
+                .addCallback(dbCallback)
                 .build()
-        
+
-        private val migration_10_11 = object: Migration(10, 11) {
+        private val dbCallback = object : Callback() {
+            override fun onOpen(db: SupportSQLiteDatabase) {
+
+            }
+        }
+
+        private val migration_10_11 = object : Migration(10, 11) {
             override fun migrate(database: SupportSQLiteDatabase) {
                 database.execSQL("DROP TABLE txtTocRules")
                 database.execSQL(

app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookActivity.kt

@@ -69,8 +69,7 @@ class ArrangeBookActivity : VMBaseActivity<ArrangeBookViewModel>(R.layout.activi
         recycler_view.addItemDecoration(VerticalDivider(this))
         adapter = ArrangeBookAdapter(this, this)
         recycler_view.adapter = adapter
-        val itemTouchCallback = ItemTouchCallback()
+        val itemTouchCallback = ItemTouchCallback(adapter)
-        itemTouchCallback.onItemTouchCallbackListener = adapter
         itemTouchCallback.isCanDrag = getPrefInt(PreferKey.bookshelfSort) == 3
         val dragSelectTouchHelper: DragSelectTouchHelper =
             DragSelectTouchHelper(adapter.initDragSelectTouchHelperCallback()).setSlideArea(16, 50)

app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookAdapter.kt

@@ -19,7 +19,7 @@ import java.util.*
 
 class ArrangeBookAdapter(context: Context, val callBack: CallBack) :
     SimpleRecyclerAdapter<Book>(context, R.layout.item_arrange_book),
-    ItemTouchCallback.OnItemTouchCallbackListener {
+    ItemTouchCallback.Callback {
     val groupRequestCode = 12
     private val selectedBooks: HashSet<Book> = hashSetOf()
     var actionItem: Book? = null

app/src/main/java/io/legado/app/ui/book/group/GroupManageDialog.kt

@@ -20,7 +20,6 @@ import io.legado.app.base.BaseDialogFragment
 import io.legado.app.base.adapter.ItemViewHolder
 import io.legado.app.base.adapter.SimpleRecyclerAdapter
 import io.legado.app.data.entities.BookGroup
-import io.legado.app.help.AppConfig
 import io.legado.app.lib.dialogs.*
 import io.legado.app.lib.theme.accentColor
 import io.legado.app.lib.theme.backgroundColor
@@ -41,7 +40,6 @@ import kotlin.collections.ArrayList
 class GroupManageDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener {
     private lateinit var viewModel: GroupViewModel
     private lateinit var adapter: GroupAdapter
-    private val callBack: CallBack? get() = parentFragment as? CallBack
 
     override fun onStart() {
         super.onStart()
@@ -62,67 +60,41 @@ class GroupManageDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener
     override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {
         tool_bar.setBackgroundColor(primaryColor)
         tool_bar.title = getString(R.string.group_manage)
+        initView()
         initData()
         initMenu()
     }
 
-    private fun initData() {
+    private fun initView() {
         adapter = GroupAdapter(requireContext())
         recycler_view.layoutManager = LinearLayoutManager(requireContext())
         recycler_view.addItemDecoration(VerticalDivider(requireContext()))
         recycler_view.adapter = adapter
+        val itemTouchCallback = ItemTouchCallback(adapter)
+        itemTouchCallback.isCanDrag = true
+        ItemTouchHelper(itemTouchCallback).attachToRecyclerView(recycler_view)
         tv_ok.setTextColor(requireContext().accentColor)
         tv_ok.visible()
         tv_ok.onClick { dismiss() }
+    }
+
+    private fun initData() {
         App.db.bookGroupDao().liveDataAll().observe(viewLifecycleOwner, {
             val diffResult =
                 DiffUtil.calculateDiff(GroupDiffCallBack(ArrayList(adapter.getItems()), it))
             adapter.setItems(it, diffResult)
         })
-        val itemTouchCallback = ItemTouchCallback()
-        itemTouchCallback.onItemTouchCallbackListener = adapter
-        itemTouchCallback.isCanDrag = true
-        ItemTouchHelper(itemTouchCallback).attachToRecyclerView(recycler_view)
     }
 
     private fun initMenu() {
         tool_bar.setOnMenuItemClickListener(this)
         tool_bar.inflateMenu(R.menu.book_group_manage)
-        tool_bar.menu.let {
+        tool_bar.menu.applyTint(requireContext())
-            it.applyTint(requireContext())
-            it.findItem(R.id.menu_group_all)
-                .isChecked = AppConfig.bookGroupAllShow
-            it.findItem(R.id.menu_group_local)
-                .isChecked = AppConfig.bookGroupLocalShow
-            it.findItem(R.id.menu_group_audio)
-                .isChecked = AppConfig.bookGroupAudioShow
-            it.findItem(R.id.menu_group_none)
-                .isChecked = AppConfig.bookGroupNoneShow
-        }
     }
 
     override fun onMenuItemClick(item: MenuItem?): Boolean {
         when (item?.itemId) {
             R.id.menu_add -> addGroup()
-            R.id.menu_group_all -> {
-                item.isChecked = !item.isChecked
-                AppConfig.bookGroupAllShow = item.isChecked
-                callBack?.upGroup()
-            }
-            R.id.menu_group_local -> {
-                item.isChecked = !item.isChecked
-                AppConfig.bookGroupLocalShow = item.isChecked
-                callBack?.upGroup()
-            }
-            R.id.menu_group_audio -> {
-                item.isChecked = !item.isChecked
-                AppConfig.bookGroupAudioShow = item.isChecked
-                callBack?.upGroup()
-            }
-            R.id.menu_group_none -> {
-                item.isChecked = !item.isChecked
-                AppConfig.bookGroupNoneShow = item.isChecked
-            }
         }
         return true
     }
@@ -204,7 +176,7 @@ class GroupManageDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener
 
     private inner class GroupAdapter(context: Context) :
         SimpleRecyclerAdapter<BookGroup>(context, R.layout.item_group_manage),
-        ItemTouchCallback.OnItemTouchCallbackListener {
+        ItemTouchCallback.Callback {
 
         private var isMoved = false
 
@@ -223,7 +195,14 @@ class GroupManageDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener
         }
 
         override fun onMove(srcPosition: Int, targetPosition: Int): Boolean {
-            Collections.swap(getItems(), srcPosition, targetPosition)
+            if (srcPosition < 4 || targetPosition < 4) {
+                return true
+            }
+            Collections.swap(
+                getItems(),
+                srcPosition - getHeaderCount(),
+                targetPosition - getHeaderCount()
+            )
             notifyItemMoved(srcPosition, targetPosition)
             isMoved = true
             return true
@@ -240,7 +219,4 @@ class GroupManageDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener
         }
     }
 
-    interface CallBack {
-        fun upGroup()
-    }
 }

app/src/main/java/io/legado/app/ui/book/group/GroupSelectDialog.kt

@@ -93,13 +93,11 @@ class GroupSelectDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener
         tool_bar.inflateMenu(R.menu.book_group_manage)
         tool_bar.menu.applyTint(requireContext())
         tool_bar.setOnMenuItemClickListener(this)
-        tool_bar.menu.setGroupVisible(R.id.menu_groups, false)
         adapter = GroupAdapter(requireContext())
         recycler_view.layoutManager = LinearLayoutManager(requireContext())
         recycler_view.addItemDecoration(VerticalDivider(requireContext()))
         recycler_view.adapter = adapter
-        val itemTouchCallback = ItemTouchCallback()
+        val itemTouchCallback = ItemTouchCallback(adapter)
-        itemTouchCallback.onItemTouchCallbackListener = adapter
         itemTouchCallback.isCanDrag = true
         ItemTouchHelper(itemTouchCallback).attachToRecyclerView(recycler_view)
         tv_cancel.onClick { dismiss() }
@@ -166,7 +164,7 @@ class GroupSelectDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener
 
     private inner class GroupAdapter(context: Context) :
         SimpleRecyclerAdapter<BookGroup>(context, R.layout.item_group_select),
-        ItemTouchCallback.OnItemTouchCallbackListener {
+        ItemTouchCallback.Callback {
 
         private var isMoved: Boolean = false
 

app/src/main/java/io/legado/app/ui/book/read/config/TocRegexDialog.kt

@@ -81,8 +81,7 @@ class TocRegexDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener {
         recycler_view.layoutManager = LinearLayoutManager(requireContext())
         recycler_view.addItemDecoration(VerticalDivider(requireContext()))
         recycler_view.adapter = adapter
-        val itemTouchCallback = ItemTouchCallback()
+        val itemTouchCallback = ItemTouchCallback(adapter)
-        itemTouchCallback.onItemTouchCallbackListener = adapter
         itemTouchCallback.isCanDrag = true
         ItemTouchHelper(itemTouchCallback).attachToRecyclerView(recycler_view)
         tv_cancel.onClick {
@@ -199,7 +198,7 @@ class TocRegexDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener {
 
     inner class TocRegexAdapter(context: Context) :
         SimpleRecyclerAdapter<TxtTocRule>(context, R.layout.item_toc_regex),
-        ItemTouchCallback.OnItemTouchCallbackListener {
+        ItemTouchCallback.Callback {
 
         override fun convert(holder: ItemViewHolder, item: TxtTocRule, payloads: MutableList<Any>) {
             holder.itemView.apply {

app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt

@@ -166,8 +166,7 @@ class BookSourceActivity : VMBaseActivity<BookSourceViewModel>(R.layout.activity
         recycler_view.addItemDecoration(VerticalDivider(this))
         adapter = BookSourceAdapter(this, this)
         recycler_view.adapter = adapter
-        val itemTouchCallback = ItemTouchCallback()
+        val itemTouchCallback = ItemTouchCallback(adapter)
-        itemTouchCallback.onItemTouchCallbackListener = adapter
         itemTouchCallback.isCanDrag = true
         val dragSelectTouchHelper: DragSelectTouchHelper =
             DragSelectTouchHelper(adapter.initDragSelectTouchHelperCallback()).setSlideArea(16, 50)

app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceAdapter.kt

@@ -14,7 +14,7 @@ import io.legado.app.base.adapter.SimpleRecyclerAdapter
 import io.legado.app.data.entities.BookSource
 import io.legado.app.lib.theme.backgroundColor
 import io.legado.app.ui.widget.recycler.DragSelectTouchHelper
-import io.legado.app.ui.widget.recycler.ItemTouchCallback.OnItemTouchCallbackListener
+import io.legado.app.ui.widget.recycler.ItemTouchCallback.Callback
 import io.legado.app.utils.invisible
 import io.legado.app.utils.visible
 import kotlinx.android.synthetic.main.item_book_source.view.*
@@ -23,7 +23,7 @@ import java.util.*
 
 class BookSourceAdapter(context: Context, val callBack: CallBack) :
     SimpleRecyclerAdapter<BookSource>(context, R.layout.item_book_source),
-    OnItemTouchCallbackListener {
+    Callback {
 
     private val selected = linkedSetOf<BookSource>()
 

app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt

@@ -13,6 +13,7 @@ import io.legado.app.App
 import io.legado.app.R
 import io.legado.app.base.VMBaseFragment
 import io.legado.app.constant.AppConst
+import io.legado.app.constant.EventBus
 import io.legado.app.constant.PreferKey
 import io.legado.app.data.entities.BookGroup
 import io.legado.app.help.AppConfig
@@ -36,15 +37,13 @@ import kotlinx.android.synthetic.main.dialog_edit_text.view.*
 import kotlinx.android.synthetic.main.fragment_bookshelf.*
 import kotlinx.android.synthetic.main.view_tab_layout.*
 import kotlinx.android.synthetic.main.view_title_bar.*
-import kotlinx.coroutines.Dispatchers.IO
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-
 
+/**
+ * 书架界面
+ */
 class BookshelfFragment : VMBaseFragment<BookshelfViewModel>(R.layout.fragment_bookshelf),
     TabLayout.OnTabSelectedListener,
-    SearchView.OnQueryTextListener,
+    SearchView.OnQueryTextListener {
-    GroupManageDialog.CallBack {
 
     override val viewModel: BookshelfViewModel
         get() = getViewModel(BookshelfViewModel::class.java)
@@ -52,10 +51,8 @@ class BookshelfFragment : VMBaseFragment<BookshelfViewModel>(R.layout.fragment_b
         get() = getViewModelOfActivity(MainViewModel::class.java)
     private lateinit var adapter: FragmentStatePagerAdapter
     private var bookGroupLiveData: LiveData<List<BookGroup>>? = null
-    private var noGroupLiveData: LiveData<Int>? = null
     private val bookGroups = mutableListOf<BookGroup>()
     private val fragmentMap = hashMapOf<Long, BooksFragment>()
-    private var showGroupNone = false
 
     override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {
         setSupportToolbar(toolbar)
@@ -113,20 +110,7 @@ class BookshelfFragment : VMBaseFragment<BookshelfViewModel>(R.layout.fragment_b
         bookGroupLiveData = App.db.bookGroupDao().liveDataAll()
         bookGroupLiveData?.observe(viewLifecycleOwner, {
             viewModel.checkGroup(it)
-            bookGroups.clear()
+            upGroup(it)
-            bookGroups.addAll(it)
-            upGroup()
-        })
-        noGroupLiveData?.removeObservers(viewLifecycleOwner)
-        noGroupLiveData = App.db.bookDao().observeNoGroupSize()
-        noGroupLiveData?.observe(viewLifecycleOwner, {
-            if (it > 0 && !showGroupNone && AppConfig.bookGroupNoneShow) {
-                showGroupNone = true
-                upGroup()
-            } else if (it == 0 && showGroupNone) {
-                showGroupNone = false
-                upGroup()
-            }
         })
     }
 
@@ -139,39 +123,24 @@ class BookshelfFragment : VMBaseFragment<BookshelfViewModel>(R.layout.fragment_b
         return false
     }
 
-    override fun upGroup() {
+    @Synchronized
-        launch {
+    private fun upGroup(data: List<BookGroup>) {
-            var noGroupSize = 0
+        bookGroups.clear()
-            withContext(IO) {
+        if (AppConfig.bookGroupAllShow) {
-                if (AppConfig.bookGroupNoneShow) {
+            bookGroups.add(AppConst.bookGroupAll)
-                    noGroupSize = App.db.bookDao().noGroupSize
+        }
-                }
+        if (AppConfig.bookGroupLocalShow) {
-            }
+            bookGroups.add(AppConst.bookGroupLocal)
-            synchronized(this@BookshelfFragment) {
+        }
-                bookGroups.remove(AppConst.bookGroupAll)
+        if (AppConfig.bookGroupAudioShow) {
-                bookGroups.remove(AppConst.bookGroupLocal)
+            bookGroups.add(AppConst.bookGroupAudio)
-                bookGroups.remove(AppConst.bookGroupAudio)
-                bookGroups.remove(AppConst.bookGroupNone)
-                showGroupNone =
-                    if (noGroupSize > 0 && bookGroups.isNotEmpty()) {
-                        bookGroups.add(0, AppConst.bookGroupNone)
-                        true
-                    } else {
-                        false
-                    }
-                if (AppConfig.bookGroupAudioShow) {
-                    bookGroups.add(0, AppConst.bookGroupAudio)
-                }
-                if (AppConfig.bookGroupLocalShow) {
-                    bookGroups.add(0, AppConst.bookGroupLocal)
-                }
-                if (AppConfig.bookGroupAllShow) {
-                    bookGroups.add(0, AppConst.bookGroupAll)
-                }
-                adapter.notifyDataSetChanged()
-                selectLastTab()
-            }
         }
+        if (AppConfig.bookGroupNoneShow) {
+            bookGroups.add(AppConst.bookGroupNone)
+        }
+        bookGroups.addAll(data)
+        adapter.notifyDataSetChanged()
+        selectLastTab()
     }
 
     @Synchronized
@@ -243,6 +212,12 @@ class BookshelfFragment : VMBaseFragment<BookshelfViewModel>(R.layout.fragment_b
         fragmentMap[selectedGroup?.groupId]?.gotoTop()
     }
 
+    override fun observeLiveBus() {
+        observeEvent<List<BookGroup>>(EventBus.UP_BOOK_GROUP) {
+            upGroup(it)
+        }
+    }
+
     private inner class TabFragmentPageAdapter(fm: FragmentManager) :
         FragmentStatePagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 

app/src/main/java/io/legado/app/ui/replace/ReplaceRuleActivity.kt

@@ -87,8 +87,7 @@ class ReplaceRuleActivity :
         adapter = ReplaceRuleAdapter(this, this)
         recycler_view.adapter = adapter
         recycler_view.addItemDecoration(VerticalDivider(this))
-        val itemTouchCallback = ItemTouchCallback()
+        val itemTouchCallback = ItemTouchCallback(adapter)
-        itemTouchCallback.onItemTouchCallbackListener = adapter
         itemTouchCallback.isCanDrag = true
         val dragSelectTouchHelper: DragSelectTouchHelper =
             DragSelectTouchHelper(adapter.initDragSelectTouchHelperCallback()).setSlideArea(16, 50)

app/src/main/java/io/legado/app/ui/replace/ReplaceRuleAdapter.kt

@@ -20,7 +20,7 @@ import java.util.*
 
 class ReplaceRuleAdapter(context: Context, var callBack: CallBack) :
     SimpleRecyclerAdapter<ReplaceRule>(context, R.layout.item_replace_rule),
-    ItemTouchCallback.OnItemTouchCallbackListener {
+    ItemTouchCallback.Callback {
 
     private val selected = linkedSetOf<ReplaceRule>()
 

app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt

@@ -114,8 +114,7 @@ class RssSourceActivity : VMBaseActivity<RssSourceViewModel>(R.layout.activity_r
         recycler_view.addItemDecoration(VerticalDivider(this))
         adapter = RssSourceAdapter(this, this)
         recycler_view.adapter = adapter
-        val itemTouchCallback = ItemTouchCallback()
+        val itemTouchCallback = ItemTouchCallback(adapter)
-        itemTouchCallback.onItemTouchCallbackListener = adapter
         itemTouchCallback.isCanDrag = true
         val dragSelectTouchHelper: DragSelectTouchHelper =
             DragSelectTouchHelper(adapter.initDragSelectTouchHelperCallback()).setSlideArea(16, 50)

app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceAdapter.kt

@@ -19,7 +19,7 @@ import java.util.*
 
 class RssSourceAdapter(context: Context, val callBack: CallBack) :
     SimpleRecyclerAdapter<RssSource>(context, R.layout.item_rss_source),
-    ItemTouchCallback.OnItemTouchCallbackListener {
+    ItemTouchCallback.Callback {
 
     private val selected = linkedSetOf<RssSource>()
 

app/src/main/java/io/legado/app/ui/widget/recycler/ItemTouchCallback.kt

@@ -12,20 +12,16 @@ import androidx.viewpager.widget.ViewPager
  * Created by GKF on 2018/3/16.
  */
 
-class ItemTouchCallback : ItemTouchHelper.Callback() {
+class ItemTouchCallback(private val callback: Callback) : ItemTouchHelper.Callback() {
 
     private var swipeRefreshLayout: SwipeRefreshLayout? = null
     private var viewPager: ViewPager? = null
 
-    /**
-     * Item操作的回调
-     */
-    var onItemTouchCallbackListener: OnItemTouchCallbackListener? = null
-
     /**
      * 是否可以拖拽
      */
     var isCanDrag = false
+
     /**
      * 是否可以被滑动
      */
@@ -88,13 +84,11 @@ class ItemTouchCallback : ItemTouchHelper.Callback() {
         srcViewHolder: RecyclerView.ViewHolder,
         targetViewHolder: RecyclerView.ViewHolder
     ): Boolean {
-        return onItemTouchCallbackListener
+        return callback.onMove(srcViewHolder.adapterPosition, targetViewHolder.adapterPosition)
-            ?.onMove(srcViewHolder.adapterPosition, targetViewHolder.adapterPosition)
-            ?: false
     }
 
     override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
-        onItemTouchCallbackListener?.onSwiped(viewHolder.adapterPosition)
+        callback.onSwiped(viewHolder.adapterPosition)
     }
 
     override fun onSelectedChanged(viewHolder: RecyclerView.ViewHolder?, actionState: Int) {
@@ -106,10 +100,10 @@ class ItemTouchCallback : ItemTouchHelper.Callback() {
 
     override fun clearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) {
         super.clearView(recyclerView, viewHolder)
-        onItemTouchCallbackListener?.onClearView(recyclerView, viewHolder)
+        callback.onClearView(recyclerView, viewHolder)
     }
 
-    interface OnItemTouchCallbackListener {
+    interface Callback {
 
         /**
          * 当某个Item被滑动删除的时候

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

@@ -1,63 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="8dp"
+    android:orientation="vertical"
-    android:paddingRight="8dp"
+    android:padding="8dp">
-    android:paddingLeft="8dp"
-    android:paddingBottom="4dp">
 
-    <io.legado.app.ui.widget.image.CoverImageView
+    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/iv_cover"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="wrap_content">
-        android:layout_margin="8dp"
+
-        android:scaleType="centerCrop"
+        <io.legado.app.ui.widget.image.CoverImageView
-        android:src="@drawable/image_cover_default"
+            android:id="@+id/iv_cover"
-        android:transitionName="img_cover"
+            android:layout_width="match_parent"
-        app:layout_constraintTop_toTopOf="parent"
+            android:layout_height="wrap_content"
-        tools:ignore="UnusedAttribute" />
+            android:layout_margin="8dp"
-
+            android:scaleType="centerCrop"
-    <io.legado.app.ui.widget.text.BadgeView
+            android:src="@drawable/image_cover_default"
-        android:id="@+id/bv_unread"
+            android:transitionName="img_cover"
-        android:layout_width="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
-        android:layout_height="wrap_content"
+            tools:ignore="UnusedAttribute" />
-        android:layout_gravity="right"
+
-        android:includeFontPadding="false"
+        <io.legado.app.ui.widget.text.BadgeView
-        app:layout_constraintTop_toTopOf="parent"
+            android:id="@+id/bv_unread"
-        app:layout_constraintRight_toRightOf="parent"
+            android:layout_width="wrap_content"
-        tools:ignore="RtlHardcoded" />
+            android:layout_height="wrap_content"
-
+            android:layout_gravity="right"
-    <io.legado.app.ui.widget.anima.RotateLoading
+            android:includeFontPadding="false"
-        android:id="@+id/rl_loading"
+            app:layout_constraintRight_toRightOf="parent"
-        android:layout_width="22dp"
+            app:layout_constraintTop_toTopOf="parent"
-        android:layout_height="22dp"
+            tools:ignore="RtlHardcoded" />
-        android:layout_gravity="right"
+
-        android:visibility="invisible"
+        <io.legado.app.ui.widget.anima.RotateLoading
-        app:layout_constraintTop_toTopOf="parent"
+            android:id="@+id/rl_loading"
-        app:layout_constraintRight_toRightOf="parent"
+            android:layout_width="22dp"
-        app:loading_width="2dp"
+            android:layout_height="22dp"
-        app:hide_mode="invisible"
+            android:layout_gravity="right"
-        tools:ignore="RtlHardcoded" />
+            android:visibility="invisible"
+            app:hide_mode="invisible"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:loading_width="2dp"
+            tools:ignore="RtlHardcoded" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <TextView
         android:id="@+id/tv_name"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="4dp"
+        android:layout_marginTop="8dp"
-        android:paddingRight="4dp"
+        android:ellipsize="end"
-        android:includeFontPadding="false"
         android:gravity="top|center_horizontal"
+        android:includeFontPadding="false"
         android:lines="2"
-        android:ellipsize="end"
+        android:paddingLeft="4dp"
+        android:paddingRight="4dp"
         android:text="@string/book_name"
         android:textColor="@color/primaryText"
         android:textSize="12sp"
-        app:layout_constraintLeft_toLeftOf="@+id/iv_cover"
-        app:layout_constraintRight_toRightOf="@+id/iv_cover"
-        app:layout_constraintTop_toBottomOf="@+id/iv_cover"
         tools:ignore="RtlHardcoded,RtlSymmetry" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>
+
+

app/src/main/res/menu/book_group_manage.xml

@@ -10,36 +10,4 @@
         app:showAsAction="always"
         tools:ignore="AlwaysShowAction" />
 
-    <group android:id="@+id/menu_groups">
-
-        <item
-            android:id="@+id/menu_group_all"
-            android:title="@string/all"
-            android:checkable="true"
-            android:checked="true"
-            app:showAsAction="never" />
-
-        <item
-            android:id="@+id/menu_group_local"
-            android:title="@string/local"
-            android:checkable="true"
-            android:checked="false"
-            app:showAsAction="never" />
-
-        <item
-            android:id="@+id/menu_group_audio"
-            android:title="@string/audio"
-            android:checkable="true"
-            android:checked="false"
-            app:showAsAction="never" />
-
-        <item
-            android:id="@+id/menu_group_none"
-            android:title="@string/no_group"
-            android:checkable="true"
-            android:checked="false"
-            app:showAsAction="never" />
-
-    </group>
-
 </menu>