Merge branch 'master' of https://github.com/gedoor/legado

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

@@ -88,7 +88,7 @@ class ArrangeBookActivity : VMBaseActivity<ActivityArrangeBookBinding, ArrangeBo
         val itemTouchCallback = ItemTouchCallback(adapter)
         itemTouchCallback.isCanDrag = getPrefInt(PreferKey.bookshelfSort) == 3
         val dragSelectTouchHelper: DragSelectTouchHelper =
-            DragSelectTouchHelper(adapter.initDragSelectTouchHelperCallback()).setSlideArea(16, 50)
+            DragSelectTouchHelper(adapter.dragSelectCallback).setSlideArea(16, 50)
         dragSelectTouchHelper.attachToRecyclerView(binding.recyclerView)
         // When this page is opened, it is in selection mode
         dragSelectTouchHelper.activeSlideSelect()

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

@@ -165,8 +165,8 @@ class ArrangeBookAdapter(context: Context, val callBack: CallBack) :
         isMoved = false
     }
 
-    fun initDragSelectTouchHelperCallback(): DragSelectTouchHelper.Callback {
+    val dragSelectCallback: DragSelectTouchHelper.Callback =
-        return object : DragSelectTouchHelper.AdvanceCallback<Book>(Mode.ToggleAndReverse) {
+        object : DragSelectTouchHelper.AdvanceCallback<Book>(Mode.ToggleAndReverse) {
             override fun currentSelectedId(): MutableSet<Book> {
                 return selectedBooks
             }
@@ -189,7 +189,6 @@ class ArrangeBookAdapter(context: Context, val callBack: CallBack) :
                 return false
             }
         }
-    }
 
     interface CallBack {
         val groupList: List<BookGroup>

app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt

@@ -237,22 +237,22 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
     /**
      * 更新分组菜单
      */
-    private fun upGroupMenu() {
+    private fun upGroupMenu() = menu?.let { menu ->
         val selectedGroup = getPrefString("searchGroup") ?: ""
-        menu?.removeGroup(R.id.source_group)
+        menu.removeGroup(R.id.source_group)
-        var item = menu?.add(R.id.source_group, Menu.NONE, Menu.NONE, R.string.all_source)
+        var item = menu.add(R.id.source_group, Menu.NONE, Menu.NONE, R.string.all_source)
         if (selectedGroup == "") {
             item?.isChecked = true
         }
         groups.sortedWith { o1, o2 ->
             o1.cnCompare(o2)
         }.map {
-            item = menu?.add(R.id.source_group, Menu.NONE, Menu.NONE, it)
+            item = menu.add(R.id.source_group, Menu.NONE, Menu.NONE, it)
             if (it == selectedGroup) {
                 item?.isChecked = true
             }
         }
-        menu?.setGroupCheckable(R.id.source_group, true, true)
+        menu.setGroupCheckable(R.id.source_group, true, true)
     }
 
     /**

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

@@ -152,14 +152,14 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
         binding.recyclerView.addItemDecoration(VerticalDivider(this))
         adapter = BookSourceAdapter(this, this)
         binding.recyclerView.adapter = adapter
-        val itemTouchCallback = ItemTouchCallback(adapter)
+        // When this page is opened, it is in selection mode
-        itemTouchCallback.isCanDrag = true
         val dragSelectTouchHelper: DragSelectTouchHelper =
-            DragSelectTouchHelper(adapter.initDragSelectTouchHelperCallback()).setSlideArea(16, 50)
+            DragSelectTouchHelper(adapter.dragSelectCallback).setSlideArea(16, 50)
         dragSelectTouchHelper.attachToRecyclerView(binding.recyclerView)
-        // When this page is opened, it is in selection mode
         dragSelectTouchHelper.activeSlideSelect()
         // Note: need judge selection first, so add ItemTouchHelper after it.
+        val itemTouchCallback = ItemTouchCallback(adapter)
+        itemTouchCallback.isCanDrag = true
         ItemTouchHelper(itemTouchCallback).attachToRecyclerView(binding.recyclerView)
     }
 
@@ -339,12 +339,12 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
         }.show()
     }
 
-    private fun upGroupMenu() {
+    private fun upGroupMenu() = groupMenu?.let { menu ->
-        groupMenu?.removeGroup(R.id.source_group)
+        menu.removeGroup(R.id.source_group)
         groups.sortedWith { o1, o2 ->
             o1.cnCompare(o2)
         }.map {
-            groupMenu?.add(R.id.source_group, Menu.NONE, Menu.NONE, it)
+            menu.add(R.id.source_group, Menu.NONE, Menu.NONE, it)
         }
     }
 

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

@@ -204,8 +204,8 @@ class BookSourceAdapter(context: Context, val callBack: CallBack) :
         }
     }
 
-    fun initDragSelectTouchHelperCallback(): DragSelectTouchHelper.Callback {
+    val dragSelectCallback: DragSelectTouchHelper.Callback =
-        return object : DragSelectTouchHelper.AdvanceCallback<BookSource>(Mode.ToggleAndReverse) {
+        object : DragSelectTouchHelper.AdvanceCallback<BookSource>(Mode.ToggleAndReverse) {
             override fun currentSelectedId(): MutableSet<BookSource> {
                 return selected
             }
@@ -228,7 +228,6 @@ class BookSourceAdapter(context: Context, val callBack: CallBack) :
                 return false
             }
         }
-    }
 
     interface CallBack {
         fun del(bookSource: BookSource)

app/src/main/java/io/legado/app/ui/main/explore/ExploreFragment.kt

@@ -123,8 +123,7 @@ class ExploreFragment : VMBaseFragment<ExploreViewModel>(R.layout.fragment_explo
         })
     }
 
-    private fun upGroupsMenu() {
+    private fun upGroupsMenu() = groupsMenu?.let { subMenu ->
-        groupsMenu?.let { subMenu ->
         subMenu.removeGroup(R.id.menu_group_text)
         groups.sortedWith { o1, o2 ->
             o1.cnCompare(o2)
@@ -132,7 +131,6 @@ class ExploreFragment : VMBaseFragment<ExploreViewModel>(R.layout.fragment_explo
             subMenu.add(R.id.menu_group_text, Menu.NONE, Menu.NONE, it)
         }
     }
-    }
 
     override fun onCompatOptionsItemSelected(item: MenuItem) {
         super.onCompatOptionsItemSelected(item)

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

@@ -92,7 +92,7 @@ class ReplaceRuleActivity : VMBaseActivity<ActivityReplaceRuleBinding, ReplaceRu
         val itemTouchCallback = ItemTouchCallback(adapter)
         itemTouchCallback.isCanDrag = true
         val dragSelectTouchHelper: DragSelectTouchHelper =
-            DragSelectTouchHelper(adapter.initDragSelectTouchHelperCallback()).setSlideArea(16, 50)
+            DragSelectTouchHelper(adapter.dragSelectCallback).setSlideArea(16, 50)
         dragSelectTouchHelper.attachToRecyclerView(binding.recyclerView)
         // When this page is opened, it is in selection mode
         dragSelectTouchHelper.activeSlideSelect()

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

@@ -167,8 +167,8 @@ class ReplaceRuleAdapter(context: Context, var callBack: CallBack) :
         }
     }
 
-    fun initDragSelectTouchHelperCallback(): DragSelectTouchHelper.Callback {
+    val dragSelectCallback: DragSelectTouchHelper.Callback =
-        return object : DragSelectTouchHelper.AdvanceCallback<ReplaceRule>(Mode.ToggleAndReverse) {
+        object : DragSelectTouchHelper.AdvanceCallback<ReplaceRule>(Mode.ToggleAndReverse) {
             override fun currentSelectedId(): MutableSet<ReplaceRule> {
                 return selected
             }
@@ -191,7 +191,6 @@ class ReplaceRuleAdapter(context: Context, var callBack: CallBack) :
                 return false
             }
         }
-    }
 
     interface CallBack {
         fun update(vararg rule: ReplaceRule)

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

@@ -121,13 +121,11 @@ class RssSourceActivity : VMBaseActivity<ActivityRssSourceBinding, RssSourceView
         binding.recyclerView.addItemDecoration(VerticalDivider(this))
         adapter = RssSourceAdapter(this, this)
         binding.recyclerView.adapter = adapter
-
+        // When this page is opened, it is in selection mode
         val dragSelectTouchHelper: DragSelectTouchHelper =
-            DragSelectTouchHelper(adapter.initDragSelectTouchHelperCallback()).setSlideArea(16, 50)
+            DragSelectTouchHelper(adapter.dragSelectCallback).setSlideArea(16, 50)
         dragSelectTouchHelper.attachToRecyclerView(binding.recyclerView)
-        // When this page is opened, it is in selection mode
         dragSelectTouchHelper.activeSlideSelect()
-
         // Note: need judge selection first, so add ItemTouchHelper after it.
         val itemTouchCallback = ItemTouchCallback(adapter)
         itemTouchCallback.isCanDrag = true
@@ -193,12 +191,12 @@ class RssSourceActivity : VMBaseActivity<ActivityRssSourceBinding, RssSourceView
         }.show()
     }
 
-    private fun upGroupMenu() {
+    private fun upGroupMenu() = groupMenu?.let { menu ->
-        groupMenu?.removeGroup(R.id.source_group)
+        menu.removeGroup(R.id.source_group)
         groups.sortedWith { o1, o2 ->
             o1.cnCompare(o2)
         }.map {
-            groupMenu?.add(R.id.source_group, Menu.NONE, Menu.NONE, it)
+            menu.add(R.id.source_group, Menu.NONE, Menu.NONE, it)
         }
     }
 

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

@@ -170,8 +170,8 @@ class RssSourceAdapter(context: Context, val callBack: CallBack) :
         }
     }
 
-    fun initDragSelectTouchHelperCallback(): DragSelectTouchHelper.Callback {
+    val dragSelectCallback: DragSelectTouchHelper.Callback =
-        return object : DragSelectTouchHelper.AdvanceCallback<RssSource>(Mode.ToggleAndReverse) {
+        object : DragSelectTouchHelper.AdvanceCallback<RssSource>(Mode.ToggleAndReverse) {
             override fun currentSelectedId(): MutableSet<RssSource> {
                 return selected
             }
@@ -194,7 +194,6 @@ class RssSourceAdapter(context: Context, val callBack: CallBack) :
                 return false
             }
         }
-    }
 
     interface CallBack {
         fun del(source: RssSource)