@lodev09/react-native-true-sheet 3.5.0-beta.1 → 3.5.1-beta.0

package/android/src/main/java/com/lodev09/truesheet/core/TrueSheetAnimator.kt

@@ -3,6 +3,7 @@ package com.lodev09.truesheet.core
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.animation.ValueAnimator
+import android.util.Log
 import android.view.animation.AccelerateInterpolator
 import android.view.animation.DecelerateInterpolator
 import android.widget.FrameLayout
@@ -29,6 +30,8 @@ class TrueSheetAnimator(private val provider: TrueSheetAnimatorProvider) {
   private var presentAnimator: ValueAnimator? = null
   private var dismissAnimator: ValueAnimator? = null
 
+  var isAnimating: Boolean = false
+
   /**
    * Animate the sheet presenting from bottom of screen to target position.
    * @param toTop The target top position of the sheet
@@ -57,14 +60,20 @@ class TrueSheetAnimator(private val provider: TrueSheetAnimatorProvider) {
       }
 
       addListener(object : AnimatorListenerAdapter() {
+        override fun onAnimationStart(animation: Animator) {
+          isAnimating = true
+        }
+
         override fun onAnimationEnd(animation: Animator) {
           bottomSheet.translationY = 0f
           presentAnimator = null
+          isAnimating = false
           onEnd()
         }
 
         override fun onAnimationCancel(animation: Animator) {
           presentAnimator = null
+          isAnimating = false
           onEnd()
         }
       })
@@ -101,13 +110,19 @@ class TrueSheetAnimator(private val provider: TrueSheetAnimatorProvider) {
       }
 
       addListener(object : AnimatorListenerAdapter() {
+        override fun onAnimationStart(animation: Animator) {
+          isAnimating = true
+        }
+
         override fun onAnimationEnd(animation: Animator) {
           dismissAnimator = null
+          isAnimating = false
           onEnd()
         }
 
         override fun onAnimationCancel(animation: Animator) {
           dismissAnimator = null
+          isAnimating = false
           onEnd()
         }
       })
@@ -125,10 +140,4 @@ class TrueSheetAnimator(private val provider: TrueSheetAnimatorProvider) {
     dismissAnimator?.cancel()
     dismissAnimator = null
   }
-
-  /**
-   * Check if any animation is currently running.
-   */
-  val isAnimating: Boolean
-    get() = presentAnimator?.isRunning == true || dismissAnimator?.isRunning == true
 }

package/android/src/main/java/com/lodev09/truesheet/core/TrueSheetDialogObserver.kt

@@ -106,4 +106,14 @@ object TrueSheetDialogObserver {
       return presentedSheetStack[index - 1]
     }
   }
+
+  /**
+   * Returns true if the given sheet is the topmost presented sheet.
+   */
+  @JvmStatic
+  fun isTopmostSheet(sheetView: TrueSheetView): Boolean {
+    synchronized(presentedSheetStack) {
+      return presentedSheetStack.lastOrNull() == sheetView
+    }
+  }
 }

package/android/src/main/java/com/lodev09/truesheet/core/TrueSheetDimView.kt

@@ -48,12 +48,12 @@ class TrueSheetDimView(private val reactContext: ThemedReactContext) : View(reac
     targetView = null
   }
 
-  fun interpolateAlpha(sheetTop: Int, dimmedDetentIndex: Int, getSheetTopForDetentIndex: (Int) -> Int) {
+  fun calculateAlpha(sheetTop: Int, dimmedDetentIndex: Int, getSheetTopForDetentIndex: (Int) -> Int): Float {
     val realHeight = ScreenUtils.getRealScreenHeight(reactContext)
     val dimmedDetentTop = getSheetTopForDetentIndex(dimmedDetentIndex)
     val belowDimmedTop = if (dimmedDetentIndex > 0) getSheetTopForDetentIndex(dimmedDetentIndex - 1) else realHeight
 
-    alpha = when {
+    return when {
       sheetTop <= dimmedDetentTop -> MAX_ALPHA
 
       sheetTop >= belowDimmedTop -> 0f
@@ -64,4 +64,8 @@ class TrueSheetDimView(private val reactContext: ThemedReactContext) : View(reac
       }
     }
   }
+
+  fun interpolateAlpha(sheetTop: Int, dimmedDetentIndex: Int, getSheetTopForDetentIndex: (Int) -> Int) {
+    alpha = calculateAlpha(sheetTop, dimmedDetentIndex, getSheetTopForDetentIndex)
+  }
 }

package/android/src/main/res/values/styles.xml

@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- No animation style - animations handled programmatically -->
-    <style name="TrueSheetNoAnimation" parent="Animation.AppCompat.Dialog">
-        <item name="android:windowEnterAnimation">@null</item>
-        <item name="android:windowExitAnimation">@null</item>
-    </style>
-
     <!-- Fast fade out animation for hiding sheet when rn-screen is presented -->
     <style name="TrueSheetFastFadeOut" parent="Animation.AppCompat.Dialog">
         <item name="android:windowEnterAnimation">@null</item>
@@ -14,7 +8,7 @@
 
     <!-- Default BottomSheetDialog style with programmatic animations -->
     <style name="TrueSheetDialog" parent="Theme.Design.Light.BottomSheetDialog">
-        <item name="android:windowAnimationStyle">@style/TrueSheetNoAnimation</item>
+        <item name="android:windowAnimationStyle">@null</item>
     </style>
 
     <!-- BottomSheetDialog style with edge-to-edge and programmatic animations -->
@@ -22,6 +16,6 @@
         <item name="android:windowIsFloating">false</item>
         <item name="enableEdgeToEdge">true</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
-        <item name="android:windowAnimationStyle">@style/TrueSheetNoAnimation</item>
+        <item name="android:windowAnimationStyle">@null</item>
     </style>
 </resources>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lodev09/react-native-true-sheet",
-  "version": "3.5.0-beta.1",
+  "version": "3.5.1-beta.0",
   "description": "The true native bottom sheet experience for your React Native Apps.",
   "source": "./src/index.ts",
   "main": "./lib/module/index.js",