renun/legado
1
0
Fork 0
mirror of https://github.com/gedoor/legado.git synced 2025-08-10 00:52:30 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
kunfei
2023-10-31 09:53:12 +08:00
parent 165403a587 81c31fcea5
commit 667f99f29b
4 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/io/legado/app/ui/book/toc/TocActivity.kt
View File

@@ -74,7 +74,12 @@ class TocActivity : VMBaseActivity<ActivityChapterListBinding, TocViewModel>(),
}
}
}
return super.dispatchTouchEvent(ev)
return try {
super.dispatchTouchEvent(ev)
} catch (e: IllegalArgumentException) {
e.printStackTrace()
false
}
}
override fun onCompatCreateOptionsMenu(menu: Menu): Boolean {

7
app/src/main/java/io/legado/app/ui/main/MainActivity.kt
View File

@@ -124,7 +124,12 @@ class MainActivity : VMBaseActivity<ActivityMainBinding, MainViewModel>(),
}
}
}
return super.dispatchTouchEvent(ev)
return try {
super.dispatchTouchEvent(ev)
} catch (e: IllegalArgumentException) {
e.printStackTrace()
false
}
}
override fun onPostCreate(savedInstanceState: Bundle?) {

4
app/src/main/java/io/legado/app/ui/main/bookshelf/style1/books/BooksFragment.kt
View File

@@ -166,7 +166,9 @@ class BooksFragment() : BaseFragment(R.layout.fragment_books),
AppLog.put("书架更新出错", it)
}.conflate().collect { list ->
binding.tvEmptyMsg.isGone = list.isNotEmpty()
binding.refreshLayout.isEnabled = list.isNotEmpty()
binding.refreshLayout.run {
isEnabled = isEnabled && list.isNotEmpty()
}
booksAdapter.setItems(list)
recoverPositionState()
delay(100)

13
app/src/main/java/io/legado/app/ui/rss/article/RssSortActivity.kt
View File

@@ -5,6 +5,7 @@ package io.legado.app.ui.rss.article
import android.os.Bundle
import android.view.Menu
import android.view.MenuItem
import android.view.MotionEvent
import android.view.ViewGroup
import androidx.activity.viewModels
import androidx.fragment.app.Fragment
@@ -54,6 +55,15 @@ class RssSortActivity : VMBaseActivity<ActivityRssArtivlesBinding, RssSortViewMo
}
}
override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
return try {
super.dispatchTouchEvent(ev)
} catch (e: IllegalArgumentException) {
e.printStackTrace()
false
}
}
override fun onCompatCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.rss_articles, menu)
return super.onCompatCreateOptionsMenu(menu)
@@ -71,6 +81,7 @@ class RssSortActivity : VMBaseActivity<ActivityRssArtivlesBinding, RssSortViewMo
putExtra("type", "rssSource")
putExtra("key", viewModel.rssSource?.sourceUrl)
}
R.id.menu_refresh_sort -> viewModel.clearSortCache { upFragments() }
R.id.menu_set_source_variable -> setSourceVariable()
R.id.menu_edit_source -> viewModel.rssSource?.sourceUrl?.let {
@@ -78,11 +89,13 @@ class RssSortActivity : VMBaseActivity<ActivityRssArtivlesBinding, RssSortViewMo
putExtra("sourceUrl", it)
}
}
R.id.menu_clear -> {
viewModel.url?.let {
viewModel.clearArticles()
}
}
R.id.menu_switch_layout -> {
viewModel.switchLayout()
upFragments()