react-native-screens 3.29.0 → 3.30.1

package/android/src/main/java/com/swmansion/rnscreens/ScreenStackHeaderConfigViewManager.kt

@@ -17,10 +17,10 @@ import javax.annotation.Nonnull
 
 @ReactModule(name = ScreenStackHeaderConfigViewManager.REACT_CLASS)
 class ScreenStackHeaderConfigViewManager : ViewGroupManager<ScreenStackHeaderConfig>(), RNSScreenStackHeaderConfigManagerInterface<ScreenStackHeaderConfig> {
-    private val mDelegate: ViewManagerDelegate<ScreenStackHeaderConfig>
+    private val delegate: ViewManagerDelegate<ScreenStackHeaderConfig>
 
     init {
-        mDelegate = RNSScreenStackHeaderConfigManagerDelegate<ScreenStackHeaderConfig, ScreenStackHeaderConfigViewManager>(this)
+        delegate = RNSScreenStackHeaderConfigManagerDelegate<ScreenStackHeaderConfig, ScreenStackHeaderConfigViewManager>(this)
     }
 
     override fun getName(): String = REACT_CLASS
@@ -143,7 +143,7 @@ class ScreenStackHeaderConfigViewManager : ViewGroupManager<ScreenStackHeaderCon
         )
     }
 
-    protected override fun getDelegate(): ViewManagerDelegate<ScreenStackHeaderConfig> = mDelegate
+    protected override fun getDelegate(): ViewManagerDelegate<ScreenStackHeaderConfig> = delegate
 
     companion object {
         const val REACT_CLASS = "RNSScreenStackHeaderConfig"

package/android/src/main/java/com/swmansion/rnscreens/ScreenStackHeaderSubview.kt

@@ -7,8 +7,8 @@ import com.facebook.react.views.view.ReactViewGroup
 
 @SuppressLint("ViewConstructor")
 class ScreenStackHeaderSubview(context: ReactContext?) : ReactViewGroup(context) {
-    private var mReactWidth = 0
-    private var mReactHeight = 0
+    private var reactWidth = 0
+    private var reactHeight = 0
     var type = Type.RIGHT
 
     val config: ScreenStackHeaderConfig?
@@ -19,15 +19,15 @@ class ScreenStackHeaderSubview(context: ReactContext?) : ReactViewGroup(context)
             MeasureSpec.getMode(heightMeasureSpec) == MeasureSpec.EXACTLY
         ) {
             // dimensions provided by react
-            mReactWidth = MeasureSpec.getSize(widthMeasureSpec)
-            mReactHeight = MeasureSpec.getSize(heightMeasureSpec)
+            reactWidth = MeasureSpec.getSize(widthMeasureSpec)
+            reactHeight = MeasureSpec.getSize(heightMeasureSpec)
             val parent = parent
             if (parent != null) {
                 forceLayout()
                 (parent as View).requestLayout()
             }
         }
-        setMeasuredDimension(mReactWidth, mReactHeight)
+        setMeasuredDimension(reactWidth, reactHeight)
     }
 
     override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) = Unit

package/android/src/main/java/com/swmansion/rnscreens/ScreenStackHeaderSubviewManager.kt

@@ -11,10 +11,10 @@ import com.facebook.react.viewmanagers.RNSScreenStackHeaderSubviewManagerInterfa
 
 @ReactModule(name = ScreenStackHeaderSubviewManager.REACT_CLASS)
 class ScreenStackHeaderSubviewManager : ViewGroupManager<ScreenStackHeaderSubview>(), RNSScreenStackHeaderSubviewManagerInterface<ScreenStackHeaderSubview> {
-    private val mDelegate: ViewManagerDelegate<ScreenStackHeaderSubview>
+    private val delegate: ViewManagerDelegate<ScreenStackHeaderSubview>
 
     init {
-        mDelegate = RNSScreenStackHeaderSubviewManagerDelegate<ScreenStackHeaderSubview, ScreenStackHeaderSubviewManager>(this)
+        delegate = RNSScreenStackHeaderSubviewManagerDelegate<ScreenStackHeaderSubview, ScreenStackHeaderSubviewManager>(this)
     }
 
     override fun getName() = REACT_CLASS
@@ -33,7 +33,7 @@ class ScreenStackHeaderSubviewManager : ViewGroupManager<ScreenStackHeaderSubvie
         }
     }
 
-    protected override fun getDelegate(): ViewManagerDelegate<ScreenStackHeaderSubview> = mDelegate
+    protected override fun getDelegate(): ViewManagerDelegate<ScreenStackHeaderSubview> = delegate
 
     companion object {
         const val REACT_CLASS = "RNSScreenStackHeaderSubview"

package/android/src/main/java/com/swmansion/rnscreens/ScreenStackViewManager.kt

@@ -14,10 +14,10 @@ import com.swmansion.rnscreens.events.StackFinishTransitioningEvent
 
 @ReactModule(name = ScreenStackViewManager.REACT_CLASS)
 class ScreenStackViewManager : ViewGroupManager<ScreenStack>(), RNSScreenStackManagerInterface<ScreenStack> {
-    private val mDelegate: ViewManagerDelegate<ScreenStack>
+    private val delegate: ViewManagerDelegate<ScreenStack>
 
     init {
-        mDelegate = RNSScreenStackManagerDelegate<ScreenStack, ScreenStackViewManager>(this)
+        delegate = RNSScreenStackManagerDelegate<ScreenStack, ScreenStackViewManager>(this)
     }
 
     override fun getName() = REACT_CLASS
@@ -63,7 +63,7 @@ class ScreenStackViewManager : ViewGroupManager<ScreenStack>(), RNSScreenStackMa
 
     override fun needsCustomLayoutForChildren() = true
 
-    protected override fun getDelegate(): ViewManagerDelegate<ScreenStack> = mDelegate
+    protected override fun getDelegate(): ViewManagerDelegate<ScreenStack> = delegate
 
     override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> = mutableMapOf(
         StackFinishTransitioningEvent.EVENT_NAME to mutableMapOf("registrationName" to "onFinishTransitioning")

package/android/src/main/java/com/swmansion/rnscreens/ScreenViewManager.kt

@@ -22,11 +22,11 @@ import com.swmansion.rnscreens.events.ScreenWillAppearEvent
 import com.swmansion.rnscreens.events.ScreenWillDisappearEvent
 
 @ReactModule(name = ScreenViewManager.REACT_CLASS)
-class ScreenViewManager : ViewGroupManager<Screen>(), RNSScreenManagerInterface<Screen> {
-    private val mDelegate: ViewManagerDelegate<Screen>
+open class ScreenViewManager : ViewGroupManager<Screen>(), RNSScreenManagerInterface<Screen> {
+    private val delegate: ViewManagerDelegate<Screen>
 
     init {
-        mDelegate = RNSScreenManagerDelegate<Screen, ScreenViewManager>(this)
+        delegate = RNSScreenManagerDelegate<Screen, ScreenViewManager>(this)
     }
 
     override fun getName() = REACT_CLASS
@@ -193,7 +193,7 @@ class ScreenViewManager : ViewGroupManager<Screen>(), RNSScreenManagerInterface<
         ScreenTransitionProgressEvent.EVENT_NAME to MapBuilder.of("registrationName", "onTransitionProgress")
     )
 
-    protected override fun getDelegate(): ViewManagerDelegate<Screen> = mDelegate
+    protected override fun getDelegate(): ViewManagerDelegate<Screen> = delegate
 
     companion object {
         const val REACT_CLASS = "RNSScreen"

package/android/src/main/java/com/swmansion/rnscreens/ScreenWindowTraits.kt

@@ -11,7 +11,6 @@ import android.os.Build
 import android.view.ViewParent
 import androidx.core.graphics.Insets
 import androidx.core.view.ViewCompat
-import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import com.facebook.react.bridge.GuardedRunnable
@@ -22,21 +21,21 @@ import com.swmansion.rnscreens.Screen.WindowTraits
 object ScreenWindowTraits {
     // Methods concerning statusBar management were taken from `react-native`'s status bar module:
     // https://github.com/facebook/react-native/blob/master/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.java
-    private var mDidSetOrientation = false
-    private var mDidSetStatusBarAppearance = false
-    private var mDidSetNavigationBarAppearance = false
-    private var mDefaultStatusBarColor: Int? = null
+    private var didSetOrientation = false
+    private var didSetStatusBarAppearance = false
+    private var didSetNavigationBarAppearance = false
+    private var defaultStatusBarColor: Int? = null
 
     internal fun applyDidSetOrientation() {
-        mDidSetOrientation = true
+        didSetOrientation = true
     }
 
     internal fun applyDidSetStatusBarAppearance() {
-        mDidSetStatusBarAppearance = true
+        didSetStatusBarAppearance = true
     }
 
     internal fun applyDidSetNavigationBarAppearance() {
-        mDidSetNavigationBarAppearance = true
+        didSetNavigationBarAppearance = true
     }
 
     internal fun setOrientation(screen: Screen, activity: Activity?) {
@@ -48,17 +47,16 @@ object ScreenWindowTraits {
         activity.requestedOrientation = orientation
     }
 
-    @SuppressLint("ObsoleteSdkInt") // to be removed when support for < 0.64 is dropped
     internal fun setColor(screen: Screen, activity: Activity?, context: ReactContext?) {
         if (activity == null || context == null) {
             return
         }
-        if (mDefaultStatusBarColor == null) {
-            mDefaultStatusBarColor = activity.window.statusBarColor
+        if (defaultStatusBarColor == null) {
+            defaultStatusBarColor = activity.window.statusBarColor
         }
         val screenForColor = findScreenForTrait(screen, WindowTraits.COLOR)
         val screenForAnimated = findScreenForTrait(screen, WindowTraits.ANIMATED)
-        val color = screenForColor?.statusBarColor ?: mDefaultStatusBarColor
+        val color = screenForColor?.statusBarColor ?: defaultStatusBarColor
         val animated = screenForAnimated?.isStatusBarAnimated ?: false
 
         UiThreadUtil.runOnUiThread(
@@ -197,7 +195,6 @@ object ScreenWindowTraits {
         val screenForNavBarHidden = findScreenForTrait(screen, WindowTraits.NAVIGATION_BAR_HIDDEN)
         val hidden = screenForNavBarHidden?.isNavigationBarHidden ?: false
 
-        WindowCompat.setDecorFitsSystemWindows(window, hidden)
         if (hidden) {
             WindowInsetsControllerCompat(window, window.decorView).let { controller ->
                 controller.hide(WindowInsetsCompat.Type.navigationBars())
@@ -213,16 +210,16 @@ object ScreenWindowTraits {
     }
 
     internal fun trySetWindowTraits(screen: Screen, activity: Activity?, context: ReactContext?) {
-        if (mDidSetOrientation) {
+        if (didSetOrientation) {
             setOrientation(screen, activity)
         }
-        if (mDidSetStatusBarAppearance) {
+        if (didSetStatusBarAppearance) {
             setColor(screen, activity, context)
             setStyle(screen, activity, context)
             setTranslucent(screen, activity, context)
             setHidden(screen, activity)
         }
-        if (mDidSetNavigationBarAppearance) {
+        if (didSetNavigationBarAppearance) {
             setNavigationBarColor(screen, activity)
             setNavigationBarHidden(screen, activity)
         }

package/android/src/main/java/com/swmansion/rnscreens/ScreensModule.kt

@@ -0,0 +1,105 @@
+package com.swmansion.rnscreens
+
+import android.util.Log
+import com.facebook.proguard.annotations.DoNotStrip
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.UiThreadUtil
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.uimanager.UIManagerHelper
+import com.swmansion.rnscreens.events.ScreenTransitionProgressEvent
+import java.util.concurrent.atomic.AtomicBoolean
+
+@ReactModule(name = ScreensModule.NAME)
+class ScreensModule(private val reactContext: ReactApplicationContext)
+    : NativeScreensModuleSpec(reactContext)
+{
+    private var topScreenId: Int = -1
+    private val isActiveTransition = AtomicBoolean(false)
+
+    init {
+        try {
+            System.loadLibrary("rnscreens")
+            val jsContext = reactApplicationContext.javaScriptContextHolder
+            if (jsContext != null) {
+                nativeInstall(jsContext.get())
+            } else {
+                Log.e("[RNScreens]", "Could not install JSI bindings.")
+            }
+        } catch (exception: Exception) {
+            Log.w("[RNScreens]", "Could not load RNScreens module.")
+        }
+    }
+
+    private external fun nativeInstall(jsiPtr: Long)
+
+    override fun getName(): String = NAME
+
+    @DoNotStrip
+    private fun startTransition(reactTag: Int?): IntArray {
+        UiThreadUtil.assertOnUiThread()
+        if (isActiveTransition.get() || reactTag == null) {
+            return intArrayOf(-1, -1)
+        }
+        topScreenId = -1
+        val result = intArrayOf(-1, -1)
+        val uiManager = UIManagerHelper.getUIManagerForReactTag(reactContext, reactTag)
+        val stack = uiManager?.resolveView(reactTag)
+        if (stack is ScreenStack) {
+            val fragments = stack.fragments
+            val screensCount = fragments.size
+            if (screensCount > 1) {
+                isActiveTransition.set(true)
+                stack.attachBelowTop()
+                topScreenId = fragments[screensCount - 1].screen.id
+                result[0] = topScreenId
+                result[1] = fragments[screensCount - 2].screen.id
+            }
+        }
+        return result
+    }
+
+    @DoNotStrip
+    private fun updateTransition(progress: Double) {
+        UiThreadUtil.assertOnUiThread()
+        if (topScreenId == -1) {
+            return
+        }
+        val progressFloat = progress.toFloat();
+        val coalescingKey = ScreenFragment.getCoalescingKey(progressFloat)
+        UIManagerHelper
+            .getEventDispatcherForReactTag(reactContext, topScreenId)
+            ?.dispatchEvent(
+                ScreenTransitionProgressEvent(
+                    UIManagerHelper.getSurfaceId(reactContext),
+                    topScreenId, progressFloat, true, true, coalescingKey
+                )
+            )
+    }
+
+    @DoNotStrip
+    private fun finishTransition(reactTag: Int?, canceled: Boolean) {
+        UiThreadUtil.assertOnUiThread()
+        if (!isActiveTransition.get() || reactTag == null) {
+            Log.e(
+                "[RNScreens]",
+                "Unable to call `finishTransition` method before transition start."
+            )
+            return
+        }
+        val uiManager = UIManagerHelper.getUIManagerForReactTag(reactContext, reactTag)
+        val stack = uiManager?.resolveView(reactTag)
+        if (stack is ScreenStack) {
+            if (canceled) {
+                stack.detachBelowTop()
+            } else {
+                stack.notifyTopDetached()
+            }
+            isActiveTransition.set(false)
+        }
+        topScreenId = -1
+    }
+
+    companion object {
+        const val NAME = "RNSModule"
+    }
+}

package/android/src/main/java/com/swmansion/rnscreens/ScreensShadowNode.kt

@@ -6,10 +6,10 @@ import com.facebook.react.uimanager.NativeViewHierarchyManager
 import com.facebook.react.uimanager.NativeViewHierarchyOptimizer
 import com.facebook.react.uimanager.UIManagerModule
 
-internal class ScreensShadowNode(private var mContext: ReactContext) : LayoutShadowNode() {
+internal class ScreensShadowNode(private var context: ReactContext) : LayoutShadowNode() {
     override fun onBeforeLayout(nativeViewHierarchyOptimizer: NativeViewHierarchyOptimizer) {
         super.onBeforeLayout(nativeViewHierarchyOptimizer)
-        (mContext.getNativeModule(UIManagerModule::class.java))?.addUIBlock { nativeViewHierarchyManager: NativeViewHierarchyManager ->
+        (context.getNativeModule(UIManagerModule::class.java))?.addUIBlock { nativeViewHierarchyManager: NativeViewHierarchyManager ->
             val view = nativeViewHierarchyManager.resolveView(reactTag)
             if (view is ScreenContainer) {
                 view.performUpdates()

package/android/src/main/java/com/swmansion/rnscreens/SearchBarManager.kt

@@ -106,6 +106,7 @@ class SearchBarManager : ViewGroupManager<SearchBarView>() {
             "clearText" -> root.handleClearTextJsRequest()
             "toggleCancelButton" -> root.handleToggleCancelButtonJsRequest(false) // just a dummy argument
             "setText" -> root.handleSetTextJsRequest(args?.getString(0))
+            "cancelSearch" -> root.handleCancelSearchJsRequest()
             else -> throw JSApplicationIllegalArgumentException("Unsupported native command received: $commandId")
         }
     }

package/android/src/main/java/com/swmansion/rnscreens/SearchBarView.kt

@@ -28,9 +28,9 @@ class SearchBarView(reactContext: ReactContext?) : ReactViewGroup(reactContext)
     var autoFocus: Boolean = false
     var shouldShowHintSearchIcon: Boolean = true
 
-    private var mSearchViewFormatter: SearchViewFormatter? = null
+    private var searchViewFormatter: SearchViewFormatter? = null
 
-    private var mAreListenersSet: Boolean = false
+    private var areListenersSet: Boolean = false
 
     private val headerConfig: ScreenStackHeaderConfig?
         get() {
@@ -52,17 +52,17 @@ class SearchBarView(reactContext: ReactContext?) : ReactViewGroup(reactContext)
     private fun setSearchViewProps() {
         val searchView = screenStackFragment?.searchView
         if (searchView != null) {
-            if (!mAreListenersSet) {
+            if (!areListenersSet) {
                 setSearchViewListeners(searchView)
-                mAreListenersSet = true
+                areListenersSet = true
             }
 
             searchView.inputType = inputType.toAndroidInputType(autoCapitalize)
-            mSearchViewFormatter?.setTextColor(textColor)
-            mSearchViewFormatter?.setTintColor(tintColor)
-            mSearchViewFormatter?.setHeaderIconColor(headerIconColor)
-            mSearchViewFormatter?.setHintTextColor(hintTextColor)
-            mSearchViewFormatter?.setPlaceholder(placeholder, shouldShowHintSearchIcon)
+            searchViewFormatter?.setTextColor(textColor)
+            searchViewFormatter?.setTintColor(tintColor)
+            searchViewFormatter?.setHeaderIconColor(headerIconColor)
+            searchViewFormatter?.setHintTextColor(hintTextColor)
+            searchViewFormatter?.setPlaceholder(placeholder, shouldShowHintSearchIcon)
             searchView.overrideBackAction = shouldOverrideBackButton
         }
     }
@@ -71,7 +71,7 @@ class SearchBarView(reactContext: ReactContext?) : ReactViewGroup(reactContext)
         super.onAttachedToWindow()
 
         screenStackFragment?.onSearchViewCreate = { newSearchView ->
-            if (mSearchViewFormatter == null) mSearchViewFormatter =
+            if (searchViewFormatter == null) searchViewFormatter =
                 SearchViewFormatter(newSearchView)
             setSearchViewProps()
             if (autoFocus) {
@@ -150,6 +150,10 @@ class SearchBarView(reactContext: ReactContext?) : ReactViewGroup(reactContext)
         text?.let { screenStackFragment?.searchView?.setText(it) }
     }
 
+    fun handleCancelSearchJsRequest() {
+        screenStackFragment?.searchView?.cancelSearch()
+    }
+
     private fun setToolbarElementsVisibility(visibility: Int) {
         for (i in 0..(headerConfig?.configSubviewsCount?.minus(1) ?: 0)) {
             val subview = headerConfig?.getConfigSubview(i)

package/android/src/main/java/com/swmansion/rnscreens/SearchViewFormatter.kt

@@ -8,8 +8,8 @@ import androidx.appcompat.R
 import androidx.appcompat.widget.SearchView
 
 class SearchViewFormatter(var searchView: SearchView) {
-    private var mDefaultTextColor: Int? = null
-    private var mDefaultTintBackground: Drawable? = null
+    private var defaultTextColor: Int? = null
+    private var defaultTintBackground: Drawable? = null
 
     private val searchEditText
         get() = searchView.findViewById<View>(R.id.search_src_text) as? EditText
@@ -21,10 +21,10 @@ class SearchViewFormatter(var searchView: SearchView) {
         get() = searchView.findViewById<ImageView>(R.id.search_close_btn)
 
     fun setTextColor(textColor: Int?) {
-        val currentDefaultTextColor = mDefaultTextColor
+        val currentDefaultTextColor = defaultTextColor
         if (textColor != null) {
-            if (mDefaultTextColor == null) {
-                mDefaultTextColor = searchEditText?.textColors?.defaultColor
+            if (defaultTextColor == null) {
+                defaultTextColor = searchEditText?.textColors?.defaultColor
             }
             searchEditText?.setTextColor(textColor)
         } else if (currentDefaultTextColor != null) {
@@ -33,10 +33,10 @@ class SearchViewFormatter(var searchView: SearchView) {
     }
 
     fun setTintColor(tintColor: Int?) {
-        val currentDefaultTintColor = mDefaultTintBackground
+        val currentDefaultTintColor = defaultTintBackground
         if (tintColor != null) {
-            if (mDefaultTintBackground == null) {
-                mDefaultTintBackground = searchTextPlate.background
+            if (defaultTintBackground == null) {
+                defaultTintBackground = searchTextPlate.background
             }
             searchTextPlate.setBackgroundColor(tintColor)
         } else if (currentDefaultTintColor != null) {

package/android/src/main/java/com/swmansion/rnscreens/events/HeaderAttachedEvent.kt

@@ -5,14 +5,10 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
 class HeaderAttachedEvent(surfaceId: Int, viewId: Int) : Event<ScreenAppearEvent>(surfaceId, viewId) {
-    override fun getEventName(): String {
-        return EVENT_NAME
-    }
+    override fun getEventName(): String = EVENT_NAME
 
-    override fun getCoalescingKey(): Short {
-        // All events for a given view can be coalesced.
-        return 0
-    }
+    // All events for a given view can be coalesced.
+    override fun getCoalescingKey(): Short = 0
 
     override fun getEventData(): WritableMap? = Arguments.createMap()
 

package/android/src/main/java/com/swmansion/rnscreens/events/HeaderBackButtonClickedEvent.kt

@@ -5,18 +5,14 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
 class HeaderBackButtonClickedEvent(surfaceId: Int, viewId: Int) : Event<ScreenAppearEvent>(surfaceId, viewId) {
-    override fun getEventName(): String {
-        return EVENT_NAME
-    }
+    override fun getEventName(): String = EVENT_NAME
 
-    override fun getCoalescingKey(): Short {
-        // All events for a given view can be coalesced.
-        return 0
-    }
+    // All events for a given view can be coalesced.
+    override fun getCoalescingKey(): Short = 0
 
     override fun getEventData(): WritableMap? = Arguments.createMap()
 
     companion object {
-        const val EVENT_NAME = "topHeaderBackButtonClickedEvent"
+        const val EVENT_NAME = "topHeaderBackButtonClicked"
     }
 }

package/android/src/main/java/com/swmansion/rnscreens/events/HeaderDetachedEvent.kt

@@ -5,14 +5,10 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
 class HeaderDetachedEvent(surfaceId: Int, viewId: Int) : Event<ScreenAppearEvent>(surfaceId, viewId) {
-    override fun getEventName(): String {
-        return EVENT_NAME
-    }
+    override fun getEventName(): String = EVENT_NAME
 
-    override fun getCoalescingKey(): Short {
-        // All events for a given view can be coalesced.
-        return 0
-    }
+    // All events for a given view can be coalesced.
+    override fun getCoalescingKey(): Short = 0
 
     override fun getEventData(): WritableMap? = Arguments.createMap()
 

package/android/src/main/java/com/swmansion/rnscreens/events/HeaderHeightChangeEvent.kt

@@ -6,17 +6,17 @@ import com.facebook.react.uimanager.events.RCTEventEmitter
 
 class HeaderHeightChangeEvent(
     viewId: Int,
-    private val mHeaderHeight: Double
+    private val headerHeight: Double
 ) : Event<HeaderHeightChangeEvent>(viewId) {
 
     override fun getEventName() = EVENT_NAME
 
     // As the same header height could appear twice, use header height as a coalescing key.
-    override fun getCoalescingKey(): Short = mHeaderHeight.toInt().toShort()
+    override fun getCoalescingKey(): Short = headerHeight.toInt().toShort()
 
     override fun dispatch(rctEventEmitter: RCTEventEmitter) {
         val map = Arguments.createMap()
-        map.putDouble("headerHeight", mHeaderHeight)
+        map.putDouble("headerHeight", headerHeight)
         rctEventEmitter.receiveEvent(viewTag, eventName, map)
     }
 

package/android/src/main/java/com/swmansion/rnscreens/events/ScreenTransitionProgressEvent.kt

@@ -7,23 +7,19 @@ import com.facebook.react.uimanager.events.Event
 class ScreenTransitionProgressEvent(
     surfaceId: Int,
     viewId: Int,
-    private val mProgress: Float,
-    private val mClosing: Boolean,
-    private val mGoingForward: Boolean,
-    private val mCoalescingKey: Short
+    private val progress: Float,
+    private val isClosing: Boolean,
+    private val isGoingForward: Boolean,
+    private val coalescingKey: Short
 ) : Event<ScreenAppearEvent?>(surfaceId, viewId) {
-    override fun getEventName(): String {
-        return EVENT_NAME
-    }
+    override fun getEventName(): String = EVENT_NAME
 
-    override fun getCoalescingKey(): Short {
-        return mCoalescingKey
-    }
+    override fun getCoalescingKey(): Short = coalescingKey
 
     override fun getEventData(): WritableMap? = Arguments.createMap().apply {
-        putDouble("progress", mProgress.toDouble())
-        putInt("closing", if (mClosing) 1 else 0)
-        putInt("goingForward", if (mGoingForward) 1 else 0)
+        putDouble("progress", progress.toDouble())
+        putInt("closing", if (isClosing) 1 else 0)
+        putInt("goingForward", if (isGoingForward) 1 else 0)
     }
 
     companion object {

package/android/src/main/java/com/swmansion/rnscreens/events/SearchBarBlurEvent.kt

@@ -5,14 +5,10 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
 class SearchBarBlurEvent(surfaceId: Int, viewId: Int) : Event<ScreenAppearEvent>(surfaceId, viewId) {
-    override fun getEventName(): String {
-        return EVENT_NAME
-    }
+    override fun getEventName(): String = EVENT_NAME
 
-    override fun getCoalescingKey(): Short {
-        // All events for a given view can be coalesced.
-        return 0
-    }
+    // All events for a given view can be coalesced.
+    override fun getCoalescingKey(): Short = 0
 
     override fun getEventData(): WritableMap? = Arguments.createMap()
 

package/android/src/main/java/com/swmansion/rnscreens/events/SearchBarChangeTextEvent.kt

@@ -9,14 +9,10 @@ class SearchBarChangeTextEvent(
     viewId: Int,
     private val text: String?,
 ) : Event<ScreenAppearEvent>(surfaceId, viewId) {
-    override fun getEventName(): String {
-        return EVENT_NAME
-    }
+    override fun getEventName(): String = EVENT_NAME
 
-    override fun getCoalescingKey(): Short {
-        // All events for a given view can be coalesced.
-        return 0
-    }
+    // All events for a given view can be coalesced.
+    override fun getCoalescingKey(): Short = 0
 
     override fun getEventData(): WritableMap? = Arguments.createMap().apply {
         putString("text", text)

package/android/src/main/java/com/swmansion/rnscreens/events/SearchBarCloseEvent.kt

@@ -5,14 +5,10 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
 class SearchBarCloseEvent(surfaceId: Int, viewId: Int) : Event<ScreenAppearEvent>(surfaceId, viewId) {
-    override fun getEventName(): String {
-        return EVENT_NAME
-    }
+    override fun getEventName(): String = EVENT_NAME
 
-    override fun getCoalescingKey(): Short {
-        // All events for a given view can be coalesced.
-        return 0
-    }
+    // All events for a given view can be coalesced.
+    override fun getCoalescingKey(): Short = 0
 
     override fun getEventData(): WritableMap? = Arguments.createMap()
 

package/android/src/main/java/com/swmansion/rnscreens/events/SearchBarFocusEvent.kt

@@ -5,14 +5,10 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
 class SearchBarFocusEvent(surfaceId: Int, viewId: Int) : Event<ScreenAppearEvent>(surfaceId, viewId) {
-    override fun getEventName(): String {
-        return EVENT_NAME
-    }
+    override fun getEventName(): String = EVENT_NAME
 
-    override fun getCoalescingKey(): Short {
-        // All events for a given view can be coalesced.
-        return 0
-    }
+    // All events for a given view can be coalesced.
+    override fun getCoalescingKey(): Short = 0
 
     override fun getEventData(): WritableMap? = Arguments.createMap()
 

package/android/src/main/java/com/swmansion/rnscreens/events/SearchBarOpenEvent.kt

@@ -5,14 +5,10 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
 class SearchBarOpenEvent(surfaceId: Int, viewId: Int) : Event<ScreenAppearEvent>(surfaceId, viewId) {
-    override fun getEventName(): String {
-        return EVENT_NAME
-    }
+    override fun getEventName(): String = EVENT_NAME
 
-    override fun getCoalescingKey(): Short {
-        // All events for a given view can be coalesced.
-        return 0
-    }
+    // All events for a given view can be coalesced.
+    override fun getCoalescingKey(): Short = 0
 
     override fun getEventData(): WritableMap? = Arguments.createMap()