acetheking987/bsky-social-app
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

more lint fix

Browse Source
This commit is contained in:
Samuel Newman
2026-04-20 12:36:46 +03:00
parent 59a01c599b
commit 3fd4333ed9
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/bottom-sheet/android/src/main/java/expo/modules/bottomsheet/BottomSheetView.kt
+19 -14
View File
@@ -41,11 +41,14 @@ class BottomSheetView(
private val screenHeight: Float = private val screenHeight: Float =
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.VANILLA_ICE_CREAM) { if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.VANILLA_ICE_CREAM) {
// API 35+: edge-to-edge is mandatory, heightPixels is the full display // API 35+: edge-to-edge is mandatory, heightPixels is the full display
context.resources.displayMetrics.heightPixels.toFloat() context.resources.displayMetrics.heightPixels
.toFloat()
} else if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R) { } else if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R) {
// API 30-34: heightPixels may exclude nav bar, use currentWindowMetrics // API 30-34: heightPixels may exclude nav bar, use currentWindowMetrics
val wm = context.getSystemService(Context.WINDOW_SERVICE) as android.view.WindowManager val wm = context.getSystemService(Context.WINDOW_SERVICE) as android.view.WindowManager
wm.currentWindowMetrics.bounds.height().toFloat() wm.currentWindowMetrics.bounds
.height()
.toFloat()
} else { } else {
// API < 30: currentWindowMetrics not available, use getRealSize // API < 30: currentWindowMetrics not available, use getRealSize
// which includes system bars (heightPixels may exclude them) // which includes system bars (heightPixels may exclude them)
@@ -166,6 +169,7 @@ class BottomSheetView(
when { when {
// Full height sheets // Full height sheets
contentHeight >= screenHeight -> 0.99f contentHeight >= screenHeight -> 0.99f
else -> this.clampRatio(this.getTargetHeight() / screenHeight) else -> this.clampRatio(this.getTargetHeight() / screenHeight)
} }
@@ -271,8 +275,9 @@ class BottomSheetView(
} }
// Apply deferred layout update after gesture completes // Apply deferred layout update after gesture completes
if (newState != BottomSheetBehavior.STATE_DRAGGING && if (newState != BottomSheetBehavior.STATE_DRAGGING &&
newState != BottomSheetBehavior.STATE_SETTLING && newState != BottomSheetBehavior.STATE_SETTLING &&
pendingLayoutUpdate) { pendingLayoutUpdate
) {
pendingLayoutUpdate = false pendingLayoutUpdate = false
updateLayout() updateLayout()
} }
@@ -292,7 +297,6 @@ class BottomSheetView(
if (!fullHeight) { if (!fullHeight) {
this.startObservingContentHeight() this.startObservingContentHeight()
} }
} }
fun updateLayout() { fun updateLayout() {
@@ -365,17 +369,18 @@ class BottomSheetView(
val innerViewGroup = this.innerView as? ViewGroup ?: return val innerViewGroup = this.innerView as? ViewGroup ?: return
val listener = OnLayoutChangeListener { _, _, top, _, bottom, _, _, oldTop, oldBottom -> val listener =
val newHeight = bottom - top OnLayoutChangeListener { _, _, top, _, bottom, _, _, oldTop, oldBottom ->
val oldHeight = oldBottom - oldTop val newHeight = bottom - top
if (newHeight != oldHeight) { val oldHeight = oldBottom - oldTop
val contentHeight = getContentHeight() if (newHeight != oldHeight) {
if (contentHeight != lastObservedContentHeight && contentHeight > 0 && (isOpen || isOpening) && !isClosing) { val contentHeight = getContentHeight()
lastObservedContentHeight = contentHeight if (contentHeight != lastObservedContentHeight && contentHeight > 0 && (isOpen || isOpening) && !isClosing) {
updateLayout() lastObservedContentHeight = contentHeight
updateLayout()
}
} }
} }
}
val children = mutableListOf<View>() val children = mutableListOf<View>()
for (i in 0 until innerViewGroup.childCount) { for (i in 0 until innerViewGroup.childCount) {