Skip to content
This repository was archived by the owner on Jul 16, 2024. It is now read-only.

Commit 3cc2000

Browse files
committed
简化 WebActivity 的 onBackPressed 逻辑
1 parent 3c3ab1c commit 3cc2000

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

web/src/main/kotlin/io/goooler/demoapp/web/WebActivity.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ class WebActivity : BaseBindingActivity<WebActivityBinding>() {
3838
}
3939

4040
override fun onBackPressed() {
41-
if (webFragment?.canGoBack == true) {
42-
webFragment?.goBack()
43-
} else {
41+
if (webFragment?.goBack() == false) {
4442
super.onBackPressed()
4543
}
4644
}

web/src/main/kotlin/io/goooler/demoapp/web/WebFragment.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@ class WebFragment : BaseBindingFragment<WebFragmentBinding>() {
2323

2424
val url: String? get() = binding.webView.url
2525

26-
val canGoBack: Boolean get() = binding.webView.canGoBack()
27-
28-
fun goBack() {
29-
binding.webView.goBack()
26+
fun goBack(): Boolean = binding.webView.canGoBack().also {
27+
if (it) binding.webView.goBack()
3028
}
3129

3230
override fun initOnce() {

0 commit comments

Comments
 (0)