1
1
package com.holix.android.bottomsheetdialog.compose
2
2
3
- import androidx.compose.foundation.gestures.Orientation
4
- import androidx.compose.foundation.gestures.rememberScrollableState
5
- import androidx.compose.foundation.gestures.scrollable
6
- import android.annotation.SuppressLint
7
3
import android.content.Context
8
4
import android.graphics.Outline
9
5
import android.os.Build
@@ -13,6 +9,9 @@ import androidx.activity.setViewTreeOnBackPressedDispatcherOwner
13
9
import androidx.annotation.FloatRange
14
10
import androidx.annotation.IntRange
15
11
import androidx.annotation.Px
12
+ import androidx.compose.foundation.gestures.Orientation
13
+ import androidx.compose.foundation.gestures.rememberScrollableState
14
+ import androidx.compose.foundation.gestures.scrollable
16
15
import androidx.compose.runtime.*
17
16
import androidx.compose.runtime.saveable.rememberSaveable
18
17
import androidx.compose.ui.ExperimentalComposeUiApi
@@ -32,8 +31,10 @@ import androidx.compose.ui.unit.dp
32
31
import androidx.compose.ui.window.DialogWindowProvider
33
32
import androidx.compose.ui.window.SecureFlagPolicy
34
33
import androidx.core.view.WindowCompat
35
- import androidx.lifecycle.ViewTreeLifecycleOwner
36
- import androidx.lifecycle.ViewTreeViewModelStoreOwner
34
+ import androidx.lifecycle.findViewTreeLifecycleOwner
35
+ import androidx.lifecycle.findViewTreeViewModelStoreOwner
36
+ import androidx.lifecycle.setViewTreeLifecycleOwner
37
+ import androidx.lifecycle.setViewTreeViewModelStoreOwner
37
38
import androidx.savedstate.findViewTreeSavedStateRegistryOwner
38
39
import androidx.savedstate.setViewTreeSavedStateRegistryOwner
39
40
import com.google.android.material.bottomsheet.BottomSheetBehavior.*
@@ -428,8 +429,8 @@ private class BottomSheetDialogWrapper(
428
429
// Turn of all clipping so shadows can be drawn outside the window
429
430
(window.decorView as ? ViewGroup )?.disableClipping()
430
431
setContentView(bottomSheetDialogLayout)
431
- ViewTreeLifecycleOwner .set( bottomSheetDialogLayout, ViewTreeLifecycleOwner .get (composeView))
432
- ViewTreeViewModelStoreOwner .set( bottomSheetDialogLayout, ViewTreeViewModelStoreOwner .get (composeView))
432
+ bottomSheetDialogLayout.setViewTreeLifecycleOwner (composeView.findViewTreeLifecycleOwner( ))
433
+ bottomSheetDialogLayout.setViewTreeViewModelStoreOwner (composeView.findViewTreeViewModelStoreOwner( ))
433
434
bottomSheetDialogLayout.setViewTreeOnBackPressedDispatcherOwner(this )
434
435
bottomSheetDialogLayout.setViewTreeSavedStateRegistryOwner(
435
436
composeView.findViewTreeSavedStateRegistryOwner()
0 commit comments