diff --git a/app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverDialog.kt b/app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverDialog.kt index 204adc35a..ae578fb62 100644 --- a/app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverDialog.kt @@ -61,7 +61,7 @@ class ChangeCoverDialog() : BaseDialogFragment(R.layout.dialog_change_cover), override fun observeLiveBus() { super.observeLiveBus() - viewModel.searchStateData.observe(viewLifecycleOwner, { + viewModel.searchStateData.observe(viewLifecycleOwner) { binding.refreshProgressBar.isAutoLoading = it if (it) { startStopMenuItem?.let { item -> @@ -75,10 +75,10 @@ class ChangeCoverDialog() : BaseDialogFragment(R.layout.dialog_change_cover), } } binding.toolBar.menu.applyTint(requireContext()) - }) - viewModel.searchBooksLiveData.observe(viewLifecycleOwner, { + } + viewModel.searchBooksLiveData.observe(viewLifecycleOwner) { adapter.setItems(it) - }) + } } override fun onMenuItemClick(item: MenuItem?): Boolean { diff --git a/app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceDialog.kt b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceDialog.kt index f5fed2bbc..5ee975143 100644 --- a/app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceDialog.kt @@ -128,7 +128,7 @@ class ChangeSourceDialog() : BaseDialogFragment(R.layout.dialog_change_source), } private fun initLiveData() { - viewModel.searchStateData.observe(viewLifecycleOwner, { + viewModel.searchStateData.observe(viewLifecycleOwner) { binding.refreshProgressBar.isAutoLoading = it if (it) { startStopMenuItem?.let { item -> @@ -142,10 +142,10 @@ class ChangeSourceDialog() : BaseDialogFragment(R.layout.dialog_change_source), } } binding.toolBar.menu.applyTint(requireContext()) - }) - viewModel.searchBooksLiveData.observe(viewLifecycleOwner, { + } + viewModel.searchBooksLiveData.observe(viewLifecycleOwner) { adapter.setItems(it) - }) + } launch { appDb.bookSourceDao.flowGroupEnabled().collect { groups.clear() diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt index 893987264..4a5bf7ce7 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt @@ -236,7 +236,13 @@ class ReadBookActivity : BaseReadBookActivity(), */ override fun onCompatOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { - R.id.menu_change_source -> { + R.id.menu_book_change_source -> { + binding.readMenu.runMenuOut() + ReadBook.book?.let { + showDialogFragment(ChangeSourceDialog(it.name, it.author)) + } + } + R.id.menu_chapter_change_source -> { binding.readMenu.runMenuOut() ReadBook.book?.let { showDialogFragment(ChangeSourceDialog(it.name, it.author)) diff --git a/app/src/main/res/menu/book_read.xml b/app/src/main/res/menu/book_read.xml index c6b87b55e..dcff16f99 100644 --- a/app/src/main/res/menu/book_read.xml +++ b/app/src/main/res/menu/book_read.xml @@ -9,7 +9,23 @@ android:id="@+id/menu_change_source" android:icon="@drawable/ic_exchange" android:title="@string/change_origin" - app:showAsAction="always" /> + app:showAsAction="always"> + +
+ +