Require

Author: t0maboro

android/src/main/java/com/swmansion/rnscreens/bottomsheet/BottomSheetMetrics.kt

@@ -12,9 +12,9 @@ fun getSheetMetrics(
     screen: Screen,
     availableHeight: Int,
     sheetHeight: Int,
-): BottomSheetMetrics? {
-    if (!screen.usesFormSheetPresentation()) {
-        return null
+): BottomSheetMetrics {
+    require(screen.usesFormSheetPresentation()) {
+        "[RNScreens] Expected screen to use form sheet presentation"
     }
 
     val maxDetent = screen.sheetDetents.lastOrNull() ?: 1.0

android/src/main/java/com/swmansion/rnscreens/bottomsheet/SheetDelegate.kt

@@ -19,7 +19,6 @@ import com.swmansion.rnscreens.KeyboardState
 import com.swmansion.rnscreens.KeyboardVisible
 import com.swmansion.rnscreens.Screen
 import com.swmansion.rnscreens.ScreenStackFragment
-import com.swmansion.rnscreens.utils.RNSLog
 
 class SheetDelegate(
     val screen: Screen,
@@ -278,11 +277,6 @@ class SheetDelegate(
                 sheetHeight = screen.height,
             )
 
-        if (metrics == null) {
-            RNSLog.w("[RNScreens]", "Sheet metrics were not defined for the screen that's expected to be the sheet")
-            return insets
-        }
-
         val newTopInset =
             if (screen.isOverflowingStatusBar(prevInsets.top, metrics) && !isImeVisible) {
                 prevInsets.top - (metrics.availableHeight - metrics.maxSheetHeight)

android/src/main/java/com/swmansion/rnscreens/utils/RNSLog.kt

@@ -22,23 +22,4 @@ object RNSLog {
             Log.d(tag, message.format(*args))
         }
     }
-
-    fun w(
-        tag: String,
-        message: String,
-    ) {
-        if (BuildConfig.RNS_DEBUG_LOGGING) {
-            Log.w(tag, message)
-        }
-    }
-
-    fun w(
-        tag: String,
-        message: String,
-        vararg args: Any,
-    ) {
-        if (BuildConfig.RNS_DEBUG_LOGGING) {
-            Log.w(tag, message.format(*args))
-        }
-    }
 }