From 0f95f0fb233af684a0ea86b8fc7991778fc6e2e4 Mon Sep 17 00:00:00 2001 From: gedoor Date: Tue, 21 Jul 2020 09:23:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/ui/main/bookshelf/BookshelfFragment.kt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt index cfd4f7d6d..1466f92f0 100644 --- a/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt @@ -88,18 +88,18 @@ class BookshelfFragment : VMBaseFragment(R.layout.fragment_b R.id.menu_add_local -> startActivity() R.id.menu_add_url -> addBookByUrl() R.id.menu_arrange_bookshelf -> startActivity( - Pair("groupId", selectedGroup.groupId), - Pair("groupName", selectedGroup.groupName) + Pair("groupId", selectedGroup?.groupId ?: 0), + Pair("groupName", selectedGroup?.groupName ?: 0) ) R.id.menu_download -> startActivity( - Pair("groupId", selectedGroup.groupId), - Pair("groupName", selectedGroup.groupName) + Pair("groupId", selectedGroup?.groupId ?: 0), + Pair("groupName", selectedGroup?.groupName ?: 0) ) } } - private val selectedGroup: BookGroup - get() = bookGroups[view_pager_bookshelf.currentItem] + private val selectedGroup: BookGroup? + get() = bookGroups.getOrNull(view_pager_bookshelf?.currentItem ?: 0) private fun initView() { ATH.applyEdgeEffectColor(view_pager_bookshelf) @@ -267,7 +267,7 @@ class BookshelfFragment : VMBaseFragment(R.layout.fragment_b } fun gotoTop() { - fragmentMap[selectedGroup.groupId]?.gotoTop() + fragmentMap[selectedGroup?.groupId]?.gotoTop() } private inner class TabFragmentPageAdapter internal constructor(fm: FragmentManager) :