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 1 Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
Horis
2024-10-20 19:43:41 +08:00
parent 7f532b583f
commit 2fa91c45e6
5 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/io/legado/app/base/BaseActivity.kt
View File

@@ -9,6 +9,7 @@ import android.os.Bundle
import android.util.AttributeSet
import android.view.Menu
import android.view.MenuItem
import android.view.MotionEvent
import android.view.View
import android.widget.FrameLayout
import androidx.annotation.RequiresApi
@@ -182,6 +183,15 @@ abstract class BaseActivity<VB : ViewBinding>(
open fun observeLiveBus() {
}
override fun dispatchTouchEvent(ev: MotionEvent): Boolean {
return try {
super.dispatchTouchEvent(ev)
} catch (e: IllegalArgumentException) {
e.printStackTrace()
false
}
}
override fun finish() {
currentFocus?.hideSoftInput()
super.finish()

3
app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
View File

@@ -293,9 +293,6 @@ class ReadBookActivity : BaseReadBookActivity(),
override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)
if (!ReadBook.inBookshelf) {
viewModel.removeFromBookshelf(null)
}
viewModel.initData(intent)
}

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

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

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

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

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

@@ -5,7 +5,6 @@ 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
@@ -55,15 +54,6 @@ 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)