Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 10144b0d0e |
@@ -12,8 +12,8 @@ android {
|
|||||||
applicationId = "org.soulstone.overwatch"
|
applicationId = "org.soulstone.overwatch"
|
||||||
minSdk = 26
|
minSdk = 26
|
||||||
targetSdk = 35
|
targetSdk = 35
|
||||||
versionCode = 13
|
versionCode = 14
|
||||||
versionName = "0.3.1"
|
versionName = "0.3.2"
|
||||||
}
|
}
|
||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
|
|||||||
@@ -92,12 +92,17 @@ class OverlayManager(
|
|||||||
|
|
||||||
val newOwner = OverlayOwner()
|
val newOwner = OverlayOwner()
|
||||||
val composeView = ComposeView(context).apply {
|
val composeView = ComposeView(context).apply {
|
||||||
setViewTreeLifecycleOwner(newOwner)
|
|
||||||
setViewTreeSavedStateRegistryOwner(newOwner)
|
|
||||||
setContent { OverlayBubble() }
|
setContent { OverlayBubble() }
|
||||||
}
|
}
|
||||||
// Wrap so we can intercept *before* MapView's own touch handling.
|
// Wrap so we can intercept *before* MapView's own touch handling.
|
||||||
|
// Compose's WindowRecomposer reads findViewTreeLifecycleOwner from
|
||||||
|
// the *window-root* view (= the wrapper here, since it's what's
|
||||||
|
// attached to WindowManager). Setting the owner only on the inner
|
||||||
|
// ComposeView throws IllegalStateException at composition startup —
|
||||||
|
// that was the v0.3.1 crash.
|
||||||
val wrapper = TouchInterceptor(context).apply {
|
val wrapper = TouchInterceptor(context).apply {
|
||||||
|
setViewTreeLifecycleOwner(newOwner)
|
||||||
|
setViewTreeSavedStateRegistryOwner(newOwner)
|
||||||
addView(
|
addView(
|
||||||
composeView,
|
composeView,
|
||||||
FrameLayout.LayoutParams(
|
FrameLayout.LayoutParams(
|
||||||
|
|||||||
Reference in New Issue
Block a user