Skip to content

Commit dbad4e9

Browse files
Merge pull request #2 from umob-developer/fix-targetsdk-35
fix for targetsdk 35
2 parents e24ca89 + 3f167cc commit dbad4e9

File tree

1 file changed

+5
-4
lines changed
  • android/src/main/lifecycle-compat/v26/com/rnmapbox/rnmbx/components/mapview

1 file changed

+5
-4
lines changed

android/src/main/lifecycle-compat/v26/com/rnmapbox/rnmbx/components/mapview/LifecycleCompat.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import android.view.View
55
import androidx.lifecycle.Lifecycle
66
import androidx.lifecycle.LifecycleOwner
77
import androidx.lifecycle.LifecycleRegistry
8-
import androidx.lifecycle.setViewTreeLifecycleOwner
8+
import androidx.lifecycle.ViewTreeLifecycleOwner
99

1010
/**
1111
* Lifecycle compatibility for Lifecycle 2.6+ which uses 'lifecycle' property
@@ -35,11 +35,12 @@ class RNMBXLifeCycle {
3535
}
3636

3737
// Lifecycle 2.6+ uses property syntax
38-
override val lifecycle: Lifecycle
39-
get() = lifecycleRegistry
38+
override fun getLifecycle(): Lifecycle {
39+
return lifecycleRegistry
40+
}
4041

4142
}
42-
view.setViewTreeLifecycleOwner(lifecycleOwner)
43+
ViewTreeLifecycleOwner.set(view, lifecycleOwner)
4344
}
4445
lifecycleOwner?.handleLifecycleEvent(Lifecycle.Event.ON_START)
4546
}

0 commit comments

Comments
 (0)