react-native-screens 5.0.0-alpha.2 → 5.0.0-alpha.4

package/android/src/main/java/com/swmansion/rnscreens/legacy/ScreenModalFragment.kt

@@ -1,281 +0,0 @@
-package com.swmansion.rnscreens.legacy
-
-import android.app.Activity
-import android.app.Dialog
-import android.content.Context
-import android.os.Build
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.ViewParent
-import android.view.WindowManager
-import androidx.fragment.app.Fragment
-import com.facebook.react.bridge.ReactContext
-import com.facebook.react.uimanager.UIManagerHelper
-import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import com.swmansion.rnscreens.ext.parentAsView
-import com.swmansion.rnscreens.ext.recycle
-import com.swmansion.rnscreens.legacy.bottomsheet.BottomSheetDialogRootView
-import com.swmansion.rnscreens.legacy.bottomsheet.BottomSheetDialogScreen
-import com.swmansion.rnscreens.legacy.events.ScreenDismissedEvent
-
-class ScreenModalFragment :
-    BottomSheetDialogFragment,
-    ScreenStackFragmentWrapper {
-    override lateinit var screen: Screen
-
-    // Nested containers
-    override val childScreenContainers = ArrayList<ScreenContainer>()
-
-    private val container: ScreenStack?
-        get() = screen.container as? ScreenStack
-
-    /**
-     * Dialog instance. Note that we are responsible for creating the dialog.
-     * This member is valid after `onCreateDialog` method runs.
-     */
-    private lateinit var sheetDialog: BottomSheetDialog
-
-    /**
-     * Behaviour attached to bottom sheet dialog.
-     * This member is valid after `onCreateDialog` method runs.
-     */
-    private val behavior
-        get() = sheetDialog.behavior
-
-    override val fragment: Fragment
-        get() = this
-
-    constructor() {
-        throw IllegalStateException(
-            "Screen fragments should never be restored. Follow instructions from https://github.com/software-mansion/react-native-screens/issues/17#issuecomment-424704067 to properly configure your main activity.",
-        )
-    }
-
-    constructor(screen: Screen) : super() {
-        this.screen = screen
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        // Right now whole purpose of this Fragment is to be displayed as a dialog.
-        // I've experimented with setting false here, but could not get it to work.
-        showsDialog = true
-    }
-
-    // We override this method to provide our custom dialog type instead of the default Dialog.
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        configureDialogAndBehaviour()
-
-        val reactEventDispatcher =
-            checkNotNull(
-                screen.reactEventDispatcher,
-            ) { "[RNScreens] No ReactEventDispatcher attached to screen while creating modal fragment" }
-        val rootView = BottomSheetDialogRootView(screen.reactContext, reactEventDispatcher)
-
-        rootView.addView(screen.recycle())
-        sheetDialog.setContentView(rootView)
-
-        rootView.parentAsView()?.clipToOutline = true
-
-        return sheetDialog
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?,
-    ): View? = null
-
-    override fun isTranslucent(): Boolean = true
-
-    override fun dismissFromContainer() {
-        check(container is ScreenStack)
-        val container = container as ScreenStack
-        container.dismiss(this)
-    }
-
-    // Modal can never be first on the stack
-    override fun canNavigateBack(): Boolean = true
-
-    override fun addChildScreenContainer(container: ScreenContainer) {
-        childScreenContainers.add(container)
-    }
-
-    override fun removeChildScreenContainer(container: ScreenContainer) {
-        childScreenContainers.remove(container)
-    }
-
-    override fun onContainerUpdate() {
-    }
-
-    override fun onViewAnimationStart() {
-    }
-
-    override fun onViewAnimationEnd() {
-    }
-
-    override fun tryGetActivity(): Activity? = requireActivity()
-
-    override fun tryGetContext(): ReactContext? {
-        if (context is ReactContext) {
-            return context as ReactContext
-        }
-        if (screen.context is ReactContext) {
-            return screen.context as ReactContext
-        }
-
-        var parent: ViewParent? = screen.container
-        while (parent != null) {
-            if (parent is Screen && parent.context is ReactContext) {
-                return parent.context as ReactContext
-            }
-            parent = parent.parent
-        }
-
-        return null
-    }
-
-    override fun canDispatchLifecycleEvent(event: ScreenFragment.ScreenLifecycleEvent): Boolean {
-        TODO("Not yet implemented")
-    }
-
-    override fun updateLastEventDispatched(event: ScreenFragment.ScreenLifecycleEvent) {
-        TODO("Not yet implemented")
-    }
-
-    override fun dispatchLifecycleEvent(
-        event: ScreenFragment.ScreenLifecycleEvent,
-        fragmentWrapper: ScreenFragmentWrapper,
-    ) {
-        TODO("Not yet implemented")
-    }
-
-    override fun dispatchLifecycleEventInChildContainers(event: ScreenFragment.ScreenLifecycleEvent) {
-        TODO("Not yet implemented")
-    }
-
-    override fun dispatchHeaderBackButtonClickedEvent() {
-        TODO("Not yet implemented")
-    }
-
-    override fun dispatchTransitionProgressEvent(
-        alpha: Float,
-        closing: Boolean,
-    ) {
-        TODO("Not yet implemented")
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        val container = container
-        if (container == null || !container.hasScreen(this)) {
-            val screenContext = screen.context
-            if (screenContext is ReactContext) {
-                val surfaceId = UIManagerHelper.getSurfaceId(screenContext)
-                UIManagerHelper
-                    .getEventDispatcherForReactTag(screenContext, screen.id)
-                    ?.dispatchEvent(ScreenDismissedEvent(surfaceId, screen.id))
-            }
-        }
-        childScreenContainers.clear()
-    }
-
-    override fun removeToolbar(): Unit = throw IllegalStateException("[RNScreens] Modal screens on Android do not support header right now")
-
-    override fun setToolbar(toolbar: CustomToolbar): Unit =
-        throw IllegalStateException("[RNScreens] Modal screens on Android do not support header right now")
-
-    override fun setToolbarShadowHidden(hidden: Boolean): Unit =
-        throw IllegalStateException("[RNScreens] Modal screens on Android do not support header right now")
-
-    override fun setToolbarTranslucent(translucent: Boolean): Unit =
-        throw IllegalStateException("[RNScreens] Modal screens on Android do not support header right now")
-
-    private fun configureDialogAndBehaviour(): BottomSheetDialog {
-        sheetDialog = BottomSheetDialogScreen(requireContext(), this)
-        sheetDialog.dismissWithAnimation = true
-        sheetDialog.setCanceledOnTouchOutside(screen.sheetClosesOnTouchOutside)
-
-        configureBehaviour()
-
-        return sheetDialog
-    }
-
-    /**
-     * This method might return slightly different values depending on code path,
-     * but during testing I've found this effect negligible. For practical purposes
-     * this is acceptable.
-     */
-    private fun tryResolveContainerHeight(): Int? {
-        screen.container?.height?.let { return it }
-        context
-            ?.resources
-            ?.displayMetrics
-            ?.heightPixels
-            ?.let { return it }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            (context?.getSystemService(Context.WINDOW_SERVICE) as? WindowManager)
-                ?.currentWindowMetrics
-                ?.bounds
-                ?.height()
-                ?.let { return it }
-        }
-        return null
-    }
-
-    private fun configureBehaviour() {
-        val containerHeight = tryResolveContainerHeight()
-        check(containerHeight != null) { "[RNScreens] Failed to find window height during bottom sheet behaviour configuration" }
-
-        behavior.apply {
-            isHideable = true
-            isDraggable = true
-        }
-
-        when (screen.sheetDetents.count) {
-            1 ->
-                behavior.apply {
-                    state = BottomSheetBehavior.STATE_EXPANDED
-                    skipCollapsed = true
-                    isFitToContents = true
-                    maxHeight = screen.sheetDetents.maxAllowedHeight(containerHeight)
-                }
-
-            2 ->
-                behavior.apply {
-                    state =
-                        screen.sheetDetents.sheetStateFromIndex(
-                            screen.sheetInitialDetentIndex,
-                        )
-                    skipCollapsed = false
-                    isFitToContents = true
-                    peekHeight = screen.sheetDetents.peekHeight(containerHeight)
-                    maxHeight = screen.sheetDetents.maxAllowedHeight(containerHeight)
-                }
-
-            3 ->
-                behavior.apply {
-                    state =
-                        screen.sheetDetents.sheetStateFromIndex(
-                            screen.sheetInitialDetentIndex,
-                        )
-                    skipCollapsed = false
-                    isFitToContents = false
-                    peekHeight = screen.sheetDetents.peekHeight(containerHeight)
-                    expandedOffset = screen.sheetDetents.expandedOffsetFromTop(containerHeight)
-                    halfExpandedRatio = screen.sheetDetents.halfExpandedRatio()
-                }
-
-            else -> throw IllegalStateException("[RNScreens] Invalid detent count ${screen.sheetDetents.count}. Expected at most 3.")
-        }
-    }
-
-    companion object {
-        const val TAG = "ScreenModalFragment"
-    }
-}

package/android/src/main/java/com/swmansion/rnscreens/legacy/bottomsheet/BottomSheetDialogRootView.kt

@@ -1,104 +0,0 @@
-package com.swmansion.rnscreens.legacy.bottomsheet
-
-import android.annotation.SuppressLint
-import android.view.MotionEvent
-import android.view.View
-import com.facebook.react.bridge.ReactContext
-import com.facebook.react.config.ReactFeatureFlags
-import com.facebook.react.uimanager.JSPointerDispatcher
-import com.facebook.react.uimanager.JSTouchDispatcher
-import com.facebook.react.uimanager.RootView
-import com.facebook.react.uimanager.events.EventDispatcher
-import com.facebook.react.views.view.ReactViewGroup
-
-@SuppressLint("ViewConstructor")
-class BottomSheetDialogRootView(
-    val reactContext: ReactContext?,
-    private val eventDispatcher: EventDispatcher,
-) : ReactViewGroup(reactContext),
-    RootView {
-    private val jsTouchDispatcher: JSTouchDispatcher = JSTouchDispatcher(this)
-    private var jsPointerDispatcher: JSPointerDispatcher? = null
-
-    init {
-        // Can we safely use ReactFeatureFlags?
-        if (ReactFeatureFlags.dispatchPointerEvents) {
-            jsPointerDispatcher = JSPointerDispatcher(this)
-        }
-    }
-
-    override fun onLayout(
-        changed: Boolean,
-        l: Int,
-        t: Int,
-        r: Int,
-        b: Int,
-    ) {
-        if (changed) {
-            // This view is used right now only in ScreenModalFragment, where it is injected
-            // to view hierarchy as a parent of a Screen.
-            assert(childCount == 1) { "[RNScreens] Expected only a single child view under $TAG, received: $childCount" }
-            getChildAt(0).layout(l, t, r, b)
-        }
-    }
-
-    override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
-        jsTouchDispatcher.handleTouchEvent(event, eventDispatcher)
-        jsPointerDispatcher?.handleMotionEvent(event, eventDispatcher, true)
-        return super.onInterceptTouchEvent(event)
-    }
-
-    override fun onTouchEvent(event: MotionEvent): Boolean {
-        jsTouchDispatcher.handleTouchEvent(event, eventDispatcher)
-        jsPointerDispatcher?.handleMotionEvent(event, eventDispatcher, false)
-        super.onTouchEvent(event)
-        return true
-    }
-
-    override fun onInterceptHoverEvent(event: MotionEvent): Boolean {
-        jsPointerDispatcher?.handleMotionEvent(event, eventDispatcher, true)
-        // This is how DialogRootViewGroup implements this, it might be a copy-paste mistake
-        // on their side.
-        return super.onHoverEvent(event)
-    }
-
-    override fun onHoverEvent(event: MotionEvent): Boolean {
-        jsPointerDispatcher?.handleMotionEvent(event, eventDispatcher, false)
-        return super.onHoverEvent(event)
-    }
-
-    override fun onChildStartedNativeGesture(
-        view: View?,
-        event: MotionEvent,
-    ) {
-        jsTouchDispatcher.onChildStartedNativeGesture(event, eventDispatcher)
-        jsPointerDispatcher?.onChildStartedNativeGesture(view, event, eventDispatcher)
-    }
-
-    @Deprecated("Deprecated by React Native")
-    override fun onChildStartedNativeGesture(event: MotionEvent): Unit =
-        throw IllegalStateException("Deprecated onChildStartedNativeGesture was called")
-
-    override fun onChildEndedNativeGesture(
-        view: View,
-        event: MotionEvent,
-    ) {
-        jsTouchDispatcher.onChildEndedNativeGesture(event, eventDispatcher)
-        jsPointerDispatcher?.onChildEndedNativeGesture()
-    }
-
-    override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {
-        // We do not pass through request of our child up the view hierarchy, as we
-        // need to keep receiving events.
-    }
-
-    override fun handleException(throwable: Throwable) {
-        // TODO: I need ThemedReactContext here.
-        // TODO: Determine where it is initially created & verify its lifecycle
-        //        reactContext?.reactApplicationContext?.handleException(RuntimeException(throwable))
-    }
-
-    companion object {
-        const val TAG = "BottomSheetDialogRootView"
-    }
-}

package/android/src/main/java/com/swmansion/rnscreens/legacy/bottomsheet/BottomSheetDialogScreen.kt

@@ -1,26 +0,0 @@
-package com.swmansion.rnscreens.legacy.bottomsheet
-
-import android.content.Context
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.swmansion.rnscreens.legacy.ScreenModalFragment
-import java.lang.ref.WeakReference
-
-class BottomSheetDialogScreen(
-    context: Context,
-    fragment: ScreenModalFragment,
-) : BottomSheetDialog(context) {
-    private val fragmentRef: WeakReference<ScreenModalFragment> = WeakReference(fragment)
-
-    // There are various code paths leading to this method, however the one I'm concerned with
-    // is dismissal via swipe-down. If the sheet is dismissed we don't want the native dismiss logic
-    // to run, as this will lead to inconsistencies in ScreenStack state. Instead we intercept
-    // dismiss intention and run our logic.
-    override fun cancel() {
-        fragmentRef.get()!!.dismissFromContainer()
-        this.show()
-    }
-
-    companion object {
-        val TAG = BottomSheetDialogScreen::class.simpleName
-    }
-}

package/android/src/main/java/com/swmansion/rnscreens/modals/dimmingview/DimmingView.kt

@@ -1,83 +0,0 @@
-package com.swmansion.rnscreens.modals.dimmingview
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.graphics.Color
-import android.view.MotionEvent
-import android.view.ViewGroup
-import com.facebook.react.uimanager.ReactCompoundViewGroup
-import com.facebook.react.uimanager.ReactPointerEventsView
-import com.swmansion.rnscreens.ext.equalWithRespectToEps
-
-/**
- * Serves as dimming view that can be used as background for some view that does not fully fill
- * the viewport.
- *
- * This dimming view has one more additional feature: it blocks gestures if its alpha > 0.
- */
-@SuppressLint("ViewConstructor") // Only we instantiate this view
-internal class DimmingView(
-    context: Context,
-    initialAlpha: Float,
-    private val pointerEventsProxy: DimmingViewPointerEventsProxy,
-) : ViewGroup(context),
-    ReactCompoundViewGroup,
-    ReactPointerEventsView by pointerEventsProxy {
-    constructor(context: Context, initialAlpha: Float) : this(
-        context,
-        initialAlpha,
-        DimmingViewPointerEventsProxy(null),
-    )
-
-    init {
-        pointerEventsProxy.pointerEventsImpl = DimmingViewPointerEventsImpl(this)
-        setFocusable(false)
-    }
-
-    internal val blockGestures
-        get() = !alpha.equalWithRespectToEps(0F)
-
-    init {
-        setBackgroundColor(Color.BLACK)
-        alpha = initialAlpha
-    }
-
-    // This view group is not supposed to have any children, however we need it to be a view group
-    override fun onLayout(
-        changed: Boolean,
-        l: Int,
-        t: Int,
-        r: Int,
-        b: Int,
-    ) = Unit
-
-    // We do not want to have any action defined here. We just want listeners notified that the click happened.
-    @SuppressLint("ClickableViewAccessibility")
-    override fun onTouchEvent(event: MotionEvent?): Boolean {
-        if (blockGestures && event?.actionMasked == MotionEvent.ACTION_UP) {
-            callOnClick()
-        }
-        return blockGestures
-    }
-
-    override fun reactTagForTouch(
-        x: Float,
-        y: Float,
-    ): Int = throw IllegalStateException("[RNScreens] $TAG should never be asked for the view tag!")
-
-    override fun interceptsTouchEvent(
-        x: Float,
-        y: Float,
-    ) = blockGestures
-
-    override fun onDetachedFromWindow() {
-        super.onDetachedFromWindow()
-
-        // Break reference cycle, since the pointerEventsImpl strongly retains this.
-        pointerEventsProxy.pointerEventsImpl = null
-    }
-
-    companion object {
-        const val TAG = "DimmingView"
-    }
-}

package/android/src/main/java/com/swmansion/rnscreens/modals/dimmingview/DimmingViewManager.kt

@@ -1,89 +0,0 @@
-package com.swmansion.rnscreens.modals.dimmingview
-
-import android.content.Context
-import android.util.Log
-import android.view.View
-import android.view.ViewGroup
-import androidx.coordinatorlayout.widget.CoordinatorLayout
-import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.bottomsheet.BottomSheetDialog
-
-class DimmingViewManager(
-    context: Context,
-    private val dialog: BottomSheetDialog,
-) {
-    // TODO: @t0maboro - consider exposing as a prop
-    internal val maxAlpha: Float = MAX_ALPHA
-
-    internal var isTransitionAnimationRunning: Boolean = false
-
-    internal var dimmingViewAlpha: Float
-        get() = dimmingView.alpha
-        set(value) {
-            dimmingView.alpha = value
-        }
-
-    private val dimmingView =
-        DimmingView(context, initialAlpha = 0f).apply {
-            layoutParams =
-                CoordinatorLayout.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                )
-        }
-
-    internal fun setOnBackdropClickListener(listener: View.OnClickListener?) {
-        dimmingView.setOnClickListener(listener)
-    }
-
-    internal fun onDialogShow() {
-        attachDimmingViewOverNativeTouchOutside()
-    }
-
-    internal fun attachToBehavior(behavior: BottomSheetBehavior<*>) {
-        behavior.addBottomSheetCallback(
-            object : BottomSheetBehavior.BottomSheetCallback() {
-                override fun onStateChanged(
-                    bottomSheet: View,
-                    newState: Int,
-                ) = Unit
-
-                override fun onSlide(
-                    bottomSheet: View,
-                    slideOffset: Float,
-                ) {
-                    // Prevent system updates from overriding alpha while running custom enter/exit animation.
-                    // When initialDetentIndex is snapping to a high detent, BottomSheetBehavior fires onSlide
-                    // events that conflict with our manual alpha animator, causing the backdrop to flash.
-                    if (isTransitionAnimationRunning) {
-                        return
-                    }
-
-                    val fraction = if (slideOffset >= 0) 1f else 1f + slideOffset
-                    dimmingView.alpha = fraction * maxAlpha
-                }
-            },
-        )
-    }
-
-    private fun attachDimmingViewOverNativeTouchOutside() {
-        val coordinator = dialog.findViewById<CoordinatorLayout>(com.google.android.material.R.id.coordinator)
-        val bottomSheetView = dialog.findViewById<View>(com.google.android.material.R.id.design_bottom_sheet)
-
-        if (coordinator != null && dimmingView.parent == null && bottomSheetView != null) {
-            val sheetIndex = coordinator.indexOfChild(bottomSheetView)
-            if (sheetIndex >= 0) {
-                coordinator.addView(dimmingView, sheetIndex)
-            } else {
-                Log.e(TAG, "[RNScreens] BottomSheetView not found! Falling back to bottom index.")
-                coordinator.addView(dimmingView, 0)
-            }
-        }
-    }
-
-    companion object {
-        const val TAG = "DimmingViewManager"
-
-        private const val MAX_ALPHA = 0.3f
-    }
-}

package/android/src/main/java/com/swmansion/rnscreens/modals/dimmingview/DimmingViewPointerEvents.kt

@@ -1,18 +0,0 @@
-package com.swmansion.rnscreens.modals.dimmingview
-
-import com.facebook.react.uimanager.PointerEvents
-import com.facebook.react.uimanager.ReactPointerEventsView
-
-internal class DimmingViewPointerEventsImpl(
-    val dimmingView: DimmingView,
-) : ReactPointerEventsView {
-    override val pointerEvents: PointerEvents
-        get() = if (dimmingView.blockGestures) PointerEvents.AUTO else PointerEvents.NONE
-}
-
-internal class DimmingViewPointerEventsProxy(
-    var pointerEventsImpl: DimmingViewPointerEventsImpl?,
-) : ReactPointerEventsView {
-    override val pointerEvents: PointerEvents
-        get() = pointerEventsImpl?.pointerEvents ?: PointerEvents.NONE
-}