Skip to content

chore: updates for tao 0.36 #1720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
lucasfernog wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

chore: updates for tao 0.36 #1720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changes/android-activity-lifecycle.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"wry": minor
---

Updated Android lifecycle JNI calls to pass the `WryActivity` instance for `start`, `resume`, `pause`, and `stop`, allowing Tao to emit window-specific lifecycle events.
8 changes: 4 additions & 4 deletions src/android/kotlin/Rust.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ object Rust {
@JvmStatic external fun onNewIntent(intent: Intent)

@JvmStatic external fun create()
@JvmStatic external fun start()
@JvmStatic external fun resume()
@JvmStatic external fun pause()
@JvmStatic external fun stop()
@JvmStatic external fun start(activity: WryActivity)
@JvmStatic external fun resume(activity: WryActivity)
@JvmStatic external fun pause(activity: WryActivity)
@JvmStatic external fun stop(activity: WryActivity)

@JvmStatic external fun wryCreate()
@JvmStatic external fun onWebviewDestroy(activity: WryActivity, webviewId: String)
Expand Down
32 changes: 12 additions & 20 deletions src/android/kotlin/WryActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,6 @@ object WryLifecycleObserver : DefaultLifecycleObserver {
Rust.create()
Rust.wryCreate()
}

override fun onStart(owner: LifecycleOwner) {
super.onStart(owner)
Rust.start()
}

override fun onResume(owner: LifecycleOwner) {
super.onResume(owner)
Rust.resume()
}

override fun onPause(owner: LifecycleOwner) {
super.onPause(owner)
Rust.pause()
}

override fun onStop(owner: LifecycleOwner) {
super.onStop(owner)
Rust.stop()
}
}

abstract class WryActivity : AppCompatActivity() {
Expand Down Expand Up @@ -116,6 +96,11 @@ abstract class WryActivity : AppCompatActivity() {
Rust.onActivityCreate(this)
}

override fun onStart() {
super.onStart()
Rust.start(this)
}

override fun onWindowFocusChanged(hasFocus: Boolean) {
super.onWindowFocusChanged(hasFocus)
Rust.onWindowFocusChanged(this, hasFocus)
Expand All @@ -129,18 +114,25 @@ abstract class WryActivity : AppCompatActivity() {

override fun onPause() {
super.onPause()
Rust.pause(this)
if (::mWebView.isInitialized) {
mWebView.onPause()
}
}

override fun onResume() {
super.onResume()
Rust.resume(this)
if (::mWebView.isInitialized) {
mWebView.onResume()
}
}

override fun onStop() {
super.onStop()
Rust.stop(this)
}

override fun onDestroy() {
super.onDestroy()
Rust.onActivityDestroy(this)
Expand Down
Loading