1
1
package com.holix.android.bottomsheetdialog.compose
2
2
3
- import android.annotation.SuppressLint
4
3
import android.content.Context
5
4
import android.graphics.Outline
6
5
import android.os.Build
@@ -11,7 +10,6 @@ import androidx.annotation.IntRange
11
10
import androidx.annotation.Px
12
11
import androidx.compose.runtime.*
13
12
import androidx.compose.runtime.saveable.rememberSaveable
14
- import androidx.compose.ui.ExperimentalComposeUiApi
15
13
import androidx.compose.ui.Modifier
16
14
import androidx.compose.ui.graphics.Color
17
15
import androidx.compose.ui.graphics.compositeOver
@@ -27,8 +25,10 @@ import androidx.compose.ui.unit.LayoutDirection
27
25
import androidx.compose.ui.unit.dp
28
26
import androidx.compose.ui.window.SecureFlagPolicy
29
27
import androidx.core.view.WindowCompat
30
- import androidx.lifecycle.ViewTreeLifecycleOwner
31
- import androidx.lifecycle.ViewTreeViewModelStoreOwner
28
+ import androidx.lifecycle.findViewTreeLifecycleOwner
29
+ import androidx.lifecycle.findViewTreeViewModelStoreOwner
30
+ import androidx.lifecycle.setViewTreeLifecycleOwner
31
+ import androidx.lifecycle.setViewTreeViewModelStoreOwner
32
32
import androidx.savedstate.findViewTreeSavedStateRegistryOwner
33
33
import androidx.savedstate.setViewTreeSavedStateRegistryOwner
34
34
import com.google.android.material.bottomsheet.BottomSheetBehavior.*
@@ -252,7 +252,6 @@ private val BlackScrimmed: (Color) -> Color = { original ->
252
252
* @param properties [BottomSheetDialogProperties] for further customization of this dialog's behavior.
253
253
* @param content The content to be displayed inside the dialog.
254
254
*/
255
- @OptIn(ExperimentalComposeUiApi ::class )
256
255
@Composable
257
256
fun BottomSheetDialog (
258
257
onDismissRequest : () -> Unit ,
@@ -431,8 +430,8 @@ private class BottomSheetDialogWrapper(
431
430
// Turn of all clipping so shadows can be drawn outside the window
432
431
(window.decorView as ? ViewGroup )?.disableClipping()
433
432
setContentView(bottomSheetDialogLayout)
434
- ViewTreeLifecycleOwner .set( bottomSheetDialogLayout, ViewTreeLifecycleOwner .get (composeView))
435
- ViewTreeViewModelStoreOwner .set( bottomSheetDialogLayout, ViewTreeViewModelStoreOwner .get (composeView))
433
+ bottomSheetDialogLayout.setViewTreeLifecycleOwner (composeView.findViewTreeLifecycleOwner( ))
434
+ bottomSheetDialogLayout.setViewTreeViewModelStoreOwner (composeView.findViewTreeViewModelStoreOwner( ))
436
435
bottomSheetDialogLayout.setViewTreeSavedStateRegistryOwner(
437
436
composeView.findViewTreeSavedStateRegistryOwner()
438
437
)
0 commit comments