添加单章换源
This commit is contained in:
@@ -61,7 +61,7 @@ class ChangeCoverDialog() : BaseDialogFragment(R.layout.dialog_change_cover),
|
|||||||
|
|
||||||
override fun observeLiveBus() {
|
override fun observeLiveBus() {
|
||||||
super.observeLiveBus()
|
super.observeLiveBus()
|
||||||
viewModel.searchStateData.observe(viewLifecycleOwner, {
|
viewModel.searchStateData.observe(viewLifecycleOwner) {
|
||||||
binding.refreshProgressBar.isAutoLoading = it
|
binding.refreshProgressBar.isAutoLoading = it
|
||||||
if (it) {
|
if (it) {
|
||||||
startStopMenuItem?.let { item ->
|
startStopMenuItem?.let { item ->
|
||||||
@@ -75,10 +75,10 @@ class ChangeCoverDialog() : BaseDialogFragment(R.layout.dialog_change_cover),
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
binding.toolBar.menu.applyTint(requireContext())
|
binding.toolBar.menu.applyTint(requireContext())
|
||||||
})
|
}
|
||||||
viewModel.searchBooksLiveData.observe(viewLifecycleOwner, {
|
viewModel.searchBooksLiveData.observe(viewLifecycleOwner) {
|
||||||
adapter.setItems(it)
|
adapter.setItems(it)
|
||||||
})
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onMenuItemClick(item: MenuItem?): Boolean {
|
override fun onMenuItemClick(item: MenuItem?): Boolean {
|
||||||
|
|||||||
@@ -128,7 +128,7 @@ class ChangeSourceDialog() : BaseDialogFragment(R.layout.dialog_change_source),
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun initLiveData() {
|
private fun initLiveData() {
|
||||||
viewModel.searchStateData.observe(viewLifecycleOwner, {
|
viewModel.searchStateData.observe(viewLifecycleOwner) {
|
||||||
binding.refreshProgressBar.isAutoLoading = it
|
binding.refreshProgressBar.isAutoLoading = it
|
||||||
if (it) {
|
if (it) {
|
||||||
startStopMenuItem?.let { item ->
|
startStopMenuItem?.let { item ->
|
||||||
@@ -142,10 +142,10 @@ class ChangeSourceDialog() : BaseDialogFragment(R.layout.dialog_change_source),
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
binding.toolBar.menu.applyTint(requireContext())
|
binding.toolBar.menu.applyTint(requireContext())
|
||||||
})
|
}
|
||||||
viewModel.searchBooksLiveData.observe(viewLifecycleOwner, {
|
viewModel.searchBooksLiveData.observe(viewLifecycleOwner) {
|
||||||
adapter.setItems(it)
|
adapter.setItems(it)
|
||||||
})
|
}
|
||||||
launch {
|
launch {
|
||||||
appDb.bookSourceDao.flowGroupEnabled().collect {
|
appDb.bookSourceDao.flowGroupEnabled().collect {
|
||||||
groups.clear()
|
groups.clear()
|
||||||
|
|||||||
@@ -236,7 +236,13 @@ class ReadBookActivity : BaseReadBookActivity(),
|
|||||||
*/
|
*/
|
||||||
override fun onCompatOptionsItemSelected(item: MenuItem): Boolean {
|
override fun onCompatOptionsItemSelected(item: MenuItem): Boolean {
|
||||||
when (item.itemId) {
|
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()
|
binding.readMenu.runMenuOut()
|
||||||
ReadBook.book?.let {
|
ReadBook.book?.let {
|
||||||
showDialogFragment(ChangeSourceDialog(it.name, it.author))
|
showDialogFragment(ChangeSourceDialog(it.name, it.author))
|
||||||
|
|||||||
@@ -9,7 +9,23 @@
|
|||||||
android:id="@+id/menu_change_source"
|
android:id="@+id/menu_change_source"
|
||||||
android:icon="@drawable/ic_exchange"
|
android:icon="@drawable/ic_exchange"
|
||||||
android:title="@string/change_origin"
|
android:title="@string/change_origin"
|
||||||
app:showAsAction="always" />
|
app:showAsAction="always">
|
||||||
|
|
||||||
|
<menu>
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@+id/menu_chapter_change_source"
|
||||||
|
android:title="@string/chapter_change_source"
|
||||||
|
app:showAsAction="never" />
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@+id/menu_book_change_source"
|
||||||
|
android:title="@string/book_change_source"
|
||||||
|
app:showAsAction="never" />
|
||||||
|
|
||||||
|
</menu>
|
||||||
|
|
||||||
|
</item>
|
||||||
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/menu_refresh"
|
android:id="@+id/menu_refresh"
|
||||||
|
|||||||
@@ -939,5 +939,7 @@
|
|||||||
<string name="menu_refresh_after">刷新之后章节</string>
|
<string name="menu_refresh_after">刷新之后章节</string>
|
||||||
<string name="menu_refresh_all">刷新全部章节</string>
|
<string name="menu_refresh_all">刷新全部章节</string>
|
||||||
<string name="edit_content">编辑内容</string>
|
<string name="edit_content">编辑内容</string>
|
||||||
|
<string name="chapter_change_source">单章换源</string>
|
||||||
|
<string name="book_change_source">整书换源</string>
|
||||||
<!-- string end -->
|
<!-- string end -->
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -942,5 +942,7 @@
|
|||||||
<string name="menu_refresh_after">刷新之后章节</string>
|
<string name="menu_refresh_after">刷新之后章节</string>
|
||||||
<string name="menu_refresh_all">刷新全部章节</string>
|
<string name="menu_refresh_all">刷新全部章节</string>
|
||||||
<string name="edit_content">编辑内容</string>
|
<string name="edit_content">编辑内容</string>
|
||||||
|
<string name="chapter_change_source">单章换源</string>
|
||||||
|
<string name="book_change_source">整书换源</string>
|
||||||
<!-- string end -->
|
<!-- string end -->
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -942,5 +942,7 @@
|
|||||||
<string name="menu_refresh_after">刷新之后章节</string>
|
<string name="menu_refresh_after">刷新之后章节</string>
|
||||||
<string name="menu_refresh_all">刷新全部章节</string>
|
<string name="menu_refresh_all">刷新全部章节</string>
|
||||||
<string name="edit_content">编辑内容</string>
|
<string name="edit_content">编辑内容</string>
|
||||||
|
<string name="chapter_change_source">单章换源</string>
|
||||||
|
<string name="book_change_source">整书换源</string>
|
||||||
<!-- string end -->
|
<!-- string end -->
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -939,5 +939,7 @@
|
|||||||
<string name="menu_refresh_after">刷新之后章节</string>
|
<string name="menu_refresh_after">刷新之后章节</string>
|
||||||
<string name="menu_refresh_all">刷新全部章节</string>
|
<string name="menu_refresh_all">刷新全部章节</string>
|
||||||
<string name="edit_content">编辑内容</string>
|
<string name="edit_content">编辑内容</string>
|
||||||
|
<string name="chapter_change_source">单章换源</string>
|
||||||
|
<string name="book_change_source">整书换源</string>
|
||||||
<!-- string end -->
|
<!-- string end -->
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -941,5 +941,7 @@
|
|||||||
<string name="menu_refresh_after">刷新之后章节</string>
|
<string name="menu_refresh_after">刷新之后章节</string>
|
||||||
<string name="menu_refresh_all">刷新全部章节</string>
|
<string name="menu_refresh_all">刷新全部章节</string>
|
||||||
<string name="edit_content">编辑内容</string>
|
<string name="edit_content">编辑内容</string>
|
||||||
|
<string name="chapter_change_source">单章换源</string>
|
||||||
|
<string name="book_change_source">整书换源</string>
|
||||||
<!-- string end -->
|
<!-- string end -->
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -941,5 +941,7 @@
|
|||||||
<string name="menu_refresh_after">刷新之后章节</string>
|
<string name="menu_refresh_after">刷新之后章节</string>
|
||||||
<string name="menu_refresh_all">刷新全部章节</string>
|
<string name="menu_refresh_all">刷新全部章节</string>
|
||||||
<string name="edit_content">编辑内容</string>
|
<string name="edit_content">编辑内容</string>
|
||||||
|
<string name="chapter_change_source">单章换源</string>
|
||||||
|
<string name="book_change_source">整书换源</string>
|
||||||
<!-- string end -->
|
<!-- string end -->
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -930,7 +930,7 @@
|
|||||||
<string name="seconds">秒</string>
|
<string name="seconds">秒</string>
|
||||||
<string name="less_than">小于</string>
|
<string name="less_than">小于</string>
|
||||||
<string name="check_source_config_summary">校验超时: %1$s秒\n校验项目:%2$s</string>
|
<string name="check_source_config_summary">校验超时: %1$s秒\n校验项目:%2$s</string>
|
||||||
<string name="record_debug_log">记录调试日志</string>
|
<string name="record_debug_log">Record debug log</string>
|
||||||
<string name="sub_dir">Sub dir</string>
|
<string name="sub_dir">Sub dir</string>
|
||||||
<string name="general">General</string>
|
<string name="general">General</string>
|
||||||
<string name="use_replace">Use replace</string>
|
<string name="use_replace">Use replace</string>
|
||||||
@@ -941,6 +941,8 @@
|
|||||||
<string name="menu_refresh_dur">刷新当前章节</string>
|
<string name="menu_refresh_dur">刷新当前章节</string>
|
||||||
<string name="menu_refresh_after">刷新之后章节</string>
|
<string name="menu_refresh_after">刷新之后章节</string>
|
||||||
<string name="menu_refresh_all">刷新全部章节</string>
|
<string name="menu_refresh_all">刷新全部章节</string>
|
||||||
<string name="edit_content">编辑内容</string>
|
<string name="edit_content">Edit Content</string>
|
||||||
|
<string name="chapter_change_source">单章换源</string>
|
||||||
|
<string name="book_change_source">整书换源</string>
|
||||||
<!-- string end -->
|
<!-- string end -->
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
Reference in New Issue
Block a user