Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash if tapping title when opening reader directly

Browse Source 
(cherry picked from commit 2f2f59279d828ee689a477104079618d6436827e)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
This commit is contained in:
arkon 2022-12-14 22:54:51 -05:00 committed by Jobobby04
parent dd367f2f70
commit 33b054edfa
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
View File

@ -144,12 +144,6 @@ class MainActivity : BaseActivity() {
// SY <-- // SY <--
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
// Do not let the launcher create a new activity http://stackoverflow.com/questions/16283079
if (!isTaskRoot) {
finish()
return
}
// Prevent splash screen showing up on configuration changes // Prevent splash screen showing up on configuration changes
val splashScreen = if (savedInstanceState == null) installSplashScreen() else null val splashScreen = if (savedInstanceState == null) installSplashScreen() else null
@ -172,6 +166,12 @@ class MainActivity : BaseActivity() {
false false
} }
// Do not let the launcher create a new activity http://stackoverflow.com/questions/16283079
if (!isTaskRoot) {
finish()
return
}
// SY --> // SY -->
@Suppress("KotlinConstantConditions") @Suppress("KotlinConstantConditions")
val hasDebugOverlay = (BuildConfig.DEBUG || BuildConfig.BUILD_TYPE == "releaseTest") val hasDebugOverlay = (BuildConfig.DEBUG || BuildConfig.BUILD_TYPE == "releaseTest")

7
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
View File

@ -466,13 +466,6 @@ class ReaderActivity : BaseActivity() {
return handled || super.dispatchGenericMotionEvent(event) return handled || super.dispatchGenericMotionEvent(event)
} }
private fun buildContainerTransform(entering: Boolean): MaterialContainerTransform {
return MaterialContainerTransform(this, entering).apply {
duration = 350 // ms
addTarget(android.R.id.content)
}
}
// SY --> // SY -->
fun TextView.textChanges(): Flow<CharSequence> = callbackFlow { fun TextView.textChanges(): Flow<CharSequence> = callbackFlow {
val listener = object : TextWatcher { val listener = object : TextWatcher {