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

fix android bottom sheet lint warnings

Browse Source 
- Replace EdgeToEdgeUtils.setLightStatusBar (internal Material API) with
  WindowInsetsControllerCompat.isAppearanceLightStatusBars (public API)
- Replace resource reflection for status_bar_height/navigation_bar_height
  with ViewCompat.getRootWindowInsets + WindowInsetsCompat
- Add missing DRAGGING/SETTLING cases to when block

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Samuel Newman
2026-03-20 17:45:40 +02:00
parent 3e7d7ce5f4
commit eeea771952
1 changed files with 11 additions and 6 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
+11 -6
View File
@@ -8,6 +8,8 @@ import android.view.ViewStructure
import android.view.Window import android.view.Window
import android.view.accessibility.AccessibilityEvent import android.view.accessibility.AccessibilityEvent
import android.widget.FrameLayout import android.widget.FrameLayout
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.WindowInsetsControllerCompat import androidx.core.view.WindowInsetsControllerCompat
import com.facebook.react.bridge.LifecycleEventListener import com.facebook.react.bridge.LifecycleEventListener
import com.facebook.react.bridge.ReactContext import com.facebook.react.bridge.ReactContext
@@ -16,7 +18,6 @@ import com.facebook.react.uimanager.UIManagerHelper
import com.facebook.react.uimanager.events.EventDispatcher import com.facebook.react.uimanager.events.EventDispatcher
import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.bottomsheet.BottomSheetDialog
import com.google.android.material.internal.EdgeToEdgeUtils
import expo.modules.kotlin.AppContext import expo.modules.kotlin.AppContext
import expo.modules.kotlin.viewevent.EventDispatcher import expo.modules.kotlin.viewevent.EventDispatcher
import expo.modules.kotlin.views.ExpoView import expo.modules.kotlin.views.ExpoView
@@ -47,13 +48,15 @@ class BottomSheetView(
} }
private fun getNavigationBarHeight(): Int { private fun getNavigationBarHeight(): Int {
val resourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android") val insets = ViewCompat.getRootWindowInsets(this)
return if (resourceId > 0) resources.getDimensionPixelSize(resourceId) else 0 ?: return 0
return insets.getInsets(WindowInsetsCompat.Type.navigationBars()).bottom
} }
private fun getStatusBarHeight(): Int { private fun getStatusBarHeight(): Int {
val resourceId = resources.getIdentifier("status_bar_height", "dimen", "android") val insets = ViewCompat.getRootWindowInsets(this)
return if (resourceId > 0) resources.getDimensionPixelSize(resourceId) else 0 ?: return 0
return insets.getInsets(WindowInsetsCompat.Type.statusBars()).top
} }
private val onAttemptDismiss by EventDispatcher() private val onAttemptDismiss by EventDispatcher()
@@ -199,7 +202,7 @@ class BottomSheetView(
insetsController.isAppearanceLightNavigationBars = originalNavBarAppearance insetsController.isAppearanceLightNavigationBars = originalNavBarAppearance
} }
if (originalStatusBarAppearance != null) { if (originalStatusBarAppearance != null) {
EdgeToEdgeUtils.setLightStatusBar(window, originalStatusBarAppearance) insetsController.isAppearanceLightStatusBars = originalStatusBarAppearance
} }
} }
} }
@@ -258,6 +261,8 @@ class BottomSheetView(
BottomSheetBehavior.STATE_COLLAPSED -> selectedSnapPoint = 1 BottomSheetBehavior.STATE_COLLAPSED -> selectedSnapPoint = 1
BottomSheetBehavior.STATE_HALF_EXPANDED -> selectedSnapPoint = 1 BottomSheetBehavior.STATE_HALF_EXPANDED -> selectedSnapPoint = 1
BottomSheetBehavior.STATE_HIDDEN -> selectedSnapPoint = 0 BottomSheetBehavior.STATE_HIDDEN -> selectedSnapPoint = 0
BottomSheetBehavior.STATE_DRAGGING,
BottomSheetBehavior.STATE_SETTLING -> { /* transient states, no snap point change */ }
} }
// Apply deferred layout update after gesture completes // Apply deferred layout update after gesture completes
if (newState != BottomSheetBehavior.STATE_DRAGGING && if (newState != BottomSheetBehavior.STATE_DRAGGING &&