react-native-screens 3.16.0 → 3.18.0

package/README.md

@@ -100,10 +100,14 @@ Screens are already integrated with the React Native's most popular navigation l
 | 2.0.0+  | 0.60.0+              |
 
 ### Support for Fabric
-[Fabric](https://reactnative.dev/architecture/fabric-renderer) is React Native's new rendering system. As of [version `3.14.0`](https://github.com/software-mansion/react-native-screens/releases/tag/3.14.0) of this project, Fabric is supported only for react-native 0.69+. Support for `0.68.x` has been dropped.
+[Fabric](https://reactnative.dev/architecture/fabric-renderer) is React Native's new rendering system. 
+
+* As of [version `3.18.0`](https://github.com/software-mansion/react-native-screens/releases/tag/3.18.0) of this project, Fabric is supported only for react-native 0.70+. Support for lower versions has been dropped.
+* As of [version `3.14.0`](https://github.com/software-mansion/react-native-screens/releases/tag/3.14.0) of this project, Fabric is supported only for react-native 0.69+. Support for lower versions has been dropped.
 
 | version | react-native version |
 | ------- | -------------------- |
+| 3.18.0+ | 0.70.0+              |
 | 3.14.0+ | 0.69.0+              |
 
 

package/android/build.gradle

@@ -55,23 +55,6 @@ android {
         versionCode 1
         versionName "1.0"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
-        if (isNewArchitectureEnabled()) {
-            var appProject = rootProject.allprojects.find {it.plugins.hasPlugin('com.android.application')}
-            externalNativeBuild {
-                ndkBuild {
-                    arguments "APP_PLATFORM=android-21",
-                            "APP_STL=c++_shared",
-                            "NDK_TOOLCHAIN_VERSION=clang",
-                            "GENERATED_SRC_DIR=${appProject.buildDir}/generated/source",
-                            "PROJECT_BUILD_DIR=${appProject.buildDir}",
-                            "REACT_ANDROID_DIR=${appProject.rootDir}/../node_modules/react-native/ReactAndroid",
-                            "REACT_ANDROID_BUILD_DIR=${appProject.rootDir}/../node_modules/react-native/ReactAndroid/build"
-                    cFlags "-Wall", "-Werror", "-fexceptions", "-frtti", "-DWITH_INSPECTOR=1"
-                    cppFlags "-std=c++17"
-                    targets "rnscreens_modules"
-                }
-            }
-        }
         ndk {
             abiFilters (*reactNativeArchitectures())
         }
@@ -83,13 +66,6 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    if (isNewArchitectureEnabled()) {
-        externalNativeBuild {
-            ndkBuild {
-                path "src/main/jni/Android.mk"
-            }
-        }
-    }
     packagingOptions {
         // For some reason gradle only complains about the duplicated version of libreact_render libraries
         // while there are more libraries copied in intermediates folder of the lib build directory, we exlude
@@ -139,13 +115,3 @@ dependencies {
     implementation 'com.google.android.material:material:1.1.0'
     implementation "androidx.core:core-ktx:1.5.0"
 }
-
-if (isNewArchitectureEnabled()) {
-    react {
-        reactRoot = rootProject.file("../node_modules/react-native/")
-        jsRootDir = file("../src/fabric/")
-        codegenDir = rootProject.file("../node_modules/react-native-codegen/")
-        libraryName = "rnscreens"
-        codegenJavaPackageName = "com.swmansion.rnscreens"
-    }
-}

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

@@ -22,7 +22,9 @@ class CustomSearchView(context: Context, fragment: Fragment) : SearchView(contex
                 isIconified = true
             }
         }
+
     private val backPressOverrider = FragmentBackPressOverrider(fragment, mOnBackPressedCallback)
+
     var overrideBackAction: Boolean
         set(value) {
             backPressOverrider.overrideBackAction = value

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

@@ -43,8 +43,7 @@ class LifecycleHelper {
     }
 
     fun <T> unregister(view: T) where T : View, T : LifecycleObserver? {
-        val lifecycle = mViewToLifecycleMap[view]
-        lifecycle?.removeObserver(view)
+        mViewToLifecycleMap[view]?.removeObserver(view)
     }
 
     companion object {

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

@@ -4,19 +4,10 @@ import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ViewManager
-import com.facebook.soloader.SoLoader
 
 class RNScreensPackage : ReactPackage {
-    override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
-        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-            // For Fabric, we load c++ native library here, this triggers screen's Fabric
-            // component registration which is necessary in order to avoid asking users
-            // to manually add init calls in their application code.
-            // This should no longer be needed if RN's autolink mechanism has Fabric support
-            SoLoader.loadLibrary("rnscreens_modules")
-        }
-        return emptyList<NativeModule>()
-    }
+    override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> =
+        emptyList()
 
     override fun createViewManagers(reactContext: ReactApplicationContext) =
         listOf<ViewManager<*, *>>(

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

@@ -84,12 +84,7 @@ class Screen constructor(context: ReactContext?) : FabricEnabledViewGroup(contex
     }
 
     val headerConfig: ScreenStackHeaderConfig?
-        get() {
-            val child = getChildAt(0)
-            return if (child is ScreenStackHeaderConfig) {
-                child
-            } else null
-        }
+        get() = getChildAt(0) as? ScreenStackHeaderConfig
 
     /**
      * While transitioning this property allows to optimize rendering behavior on Android and provide

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

@@ -35,6 +35,7 @@ open class ScreenContainer<T : ScreenFragment>(context: Context?) : ViewGroup(co
         }
     }
     private var mParentScreenFragment: ScreenFragment? = null
+
     override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
         var i = 0
         val size = childCount
@@ -116,19 +117,10 @@ open class ScreenContainer<T : ScreenFragment>(context: Context?) : ViewGroup(co
     val screenCount: Int
         get() = mScreenFragments.size
 
-    fun getScreenAt(index: Int): Screen {
-        return mScreenFragments[index].screen
-    }
+    fun getScreenAt(index: Int): Screen = mScreenFragments[index].screen
 
     open val topScreen: Screen?
-        get() {
-            for (screenFragment in mScreenFragments) {
-                if (getActivityState(screenFragment) === ActivityState.ON_TOP) {
-                    return screenFragment.screen
-                }
-            }
-            return null
-        }
+        get() = mScreenFragments.firstOrNull { getActivityState(it) === ActivityState.ON_TOP }?.screen
 
     private fun setFragmentManager(fm: FragmentManager) {
         mFragmentManager = fm
@@ -161,11 +153,11 @@ open class ScreenContainer<T : ScreenFragment>(context: Context?) : ViewGroup(co
             // `findFragment` method throws IllegalStateException when it fails to resolve appropriate
             // fragment. It might happen when e.g. React Native is loaded directly in Activity
             // but some custom fragments are still used. Such use case seems highly unlikely
-            // so, as for now we let application crash.
+            // so, as for now we fallback to activity's FragmentManager in hope for the best.
             try {
                 FragmentManager.findFragment<Fragment>(rootView).childFragmentManager
             } catch (ex: IllegalStateException) {
-                throw IllegalStateException("Failed to find fragment for React Root View")
+                context.supportFragmentManager
             }
         }
     }
@@ -200,10 +192,9 @@ open class ScreenContainer<T : ScreenFragment>(context: Context?) : ViewGroup(co
     }
 
     protected fun createTransaction(): FragmentTransaction {
-        val fragmentManager = requireNotNull(mFragmentManager, { "mFragmentManager is null when creating transaction" })
-        val transaction = fragmentManager.beginTransaction()
-        transaction.setReorderingAllowed(true)
-        return transaction
+        return requireNotNull(mFragmentManager) { "mFragmentManager is null when creating transaction" }
+            .beginTransaction()
+            .setReorderingAllowed(true)
     }
 
     private fun attachScreen(transaction: FragmentTransaction, screenFragment: ScreenFragment) {
@@ -214,13 +205,11 @@ open class ScreenContainer<T : ScreenFragment>(context: Context?) : ViewGroup(co
         transaction.remove(screenFragment)
     }
 
-    private fun getActivityState(screenFragment: ScreenFragment): ActivityState? {
-        return screenFragment.screen.activityState
-    }
+    private fun getActivityState(screenFragment: ScreenFragment): ActivityState? =
+        screenFragment.screen.activityState
 
-    open fun hasScreen(screenFragment: ScreenFragment?): Boolean {
-        return mScreenFragments.contains(screenFragment)
-    }
+    open fun hasScreen(screenFragment: ScreenFragment?): Boolean =
+        mScreenFragments.contains(screenFragment)
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
@@ -233,9 +222,7 @@ open class ScreenContainer<T : ScreenFragment>(context: Context?) : ViewGroup(co
         val transaction = fragmentManager.beginTransaction()
         var hasFragments = false
         for (fragment in fragmentManager.fragments) {
-            if (fragment is ScreenFragment &&
-                fragment.screen.container === this
-            ) {
+            if (fragment is ScreenFragment && fragment.screen.container === this) {
                 transaction.remove(fragment)
                 hasFragments = true
             }
@@ -276,19 +263,15 @@ open class ScreenContainer<T : ScreenFragment>(context: Context?) : ViewGroup(co
         // children are not already detached, which may lead to calling `onDetachedFromWindow` on them
         // twice.
         // We also get the size earlier, because we will be removing child views in `for` loop.
-        val size = childCount
-        for (i in size - 1 downTo 0) {
+        for (i in childCount - 1 downTo 0) {
             removeViewAt(i)
         }
     }
 
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         super.onMeasure(widthMeasureSpec, heightMeasureSpec)
-        var i = 0
-        val size = childCount
-        while (i < size) {
+        for (i in 0 until childCount) {
             getChildAt(i).measure(widthMeasureSpec, heightMeasureSpec)
-            i++
         }
     }
 
@@ -332,7 +315,11 @@ open class ScreenContainer<T : ScreenFragment>(context: Context?) : ViewGroup(co
     open fun onUpdate() {
         createTransaction().let {
             // detach screens that are no longer active
-            val orphaned: MutableSet<Fragment> = HashSet(requireNotNull(mFragmentManager, { "mFragmentManager is null when performing update in ScreenContainer" }).fragments)
+            val orphaned: MutableSet<Fragment> = HashSet(
+                requireNotNull(mFragmentManager) {
+                    "mFragmentManager is null when performing update in ScreenContainer"
+                }.fragments
+            )
             for (screenFragment in mScreenFragments) {
                 if (getActivityState(screenFragment) === ActivityState.INACTIVE &&
                     screenFragment.isAdded

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

@@ -9,13 +9,9 @@ import com.facebook.react.uimanager.ViewGroupManager
 
 @ReactModule(name = ScreenContainerViewManager.REACT_CLASS)
 class ScreenContainerViewManager : ViewGroupManager<ScreenContainer<*>>() {
-    override fun getName(): String {
-        return REACT_CLASS
-    }
+    override fun getName(): String = REACT_CLASS
 
-    override fun createViewInstance(reactContext: ThemedReactContext): ScreenContainer<ScreenFragment> {
-        return ScreenContainer(reactContext)
-    }
+    override fun createViewInstance(reactContext: ThemedReactContext): ScreenContainer<ScreenFragment> = ScreenContainer(reactContext)
 
     override fun addView(parent: ScreenContainer<*>, child: View, index: Int) {
         require(child is Screen) { "Attempt attach child that is not of type RNScreens" }
@@ -30,21 +26,13 @@ class ScreenContainerViewManager : ViewGroupManager<ScreenContainer<*>>() {
         parent.removeAllScreens()
     }
 
-    override fun getChildCount(parent: ScreenContainer<*>): Int {
-        return parent.screenCount
-    }
+    override fun getChildCount(parent: ScreenContainer<*>): Int = parent.screenCount
 
-    override fun getChildAt(parent: ScreenContainer<*>, index: Int): View {
-        return parent.getScreenAt(index)
-    }
+    override fun getChildAt(parent: ScreenContainer<*>, index: Int): View = parent.getScreenAt(index)
 
-    override fun createShadowNodeInstance(context: ReactApplicationContext): LayoutShadowNode {
-        return ScreensShadowNode(context)
-    }
+    override fun createShadowNodeInstance(context: ReactApplicationContext): LayoutShadowNode = ScreensShadowNode(context)
 
-    override fun needsCustomLayoutForChildren(): Boolean {
-        return true
-    }
+    override fun needsCustomLayoutForChildren(): Boolean = true
 
     companion object {
         const val REACT_CLASS = "RNSScreenContainer"

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

@@ -74,13 +74,12 @@ open class ScreenFragment : Fragment {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        val wrapper = context?.let { ScreensFrameLayout(it) }
-
-        val params = FrameLayout.LayoutParams(
+        screen.layoutParams = FrameLayout.LayoutParams(
             ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT
         )
-        screen.layoutParams = params
-        wrapper?.addView(recycleView(screen))
+        val wrapper = context?.let { ScreensFrameLayout(it) }?.apply {
+            addView(recycleView(screen))
+        }
         return wrapper
     }
 
@@ -153,13 +152,11 @@ open class ScreenFragment : Fragment {
     val childScreenContainers: List<ScreenContainer<*>>
         get() = mChildScreenContainers
 
-    private fun canDispatchEvent(event: ScreenLifecycleEvent): Boolean {
-        return when (event) {
-            ScreenLifecycleEvent.WillAppear -> canDispatchWillAppear
-            ScreenLifecycleEvent.Appear -> canDispatchAppear
-            ScreenLifecycleEvent.WillDisappear -> !canDispatchWillAppear
-            ScreenLifecycleEvent.Disappear -> !canDispatchAppear
-        }
+    private fun canDispatchEvent(event: ScreenLifecycleEvent): Boolean = when (event) {
+        ScreenLifecycleEvent.WillAppear -> canDispatchWillAppear
+        ScreenLifecycleEvent.Appear -> canDispatchAppear
+        ScreenLifecycleEvent.WillDisappear -> !canDispatchWillAppear
+        ScreenLifecycleEvent.Disappear -> !canDispatchAppear
     }
 
     private fun setLastEventDispatched(event: ScreenLifecycleEvent) {
@@ -173,25 +170,21 @@ open class ScreenFragment : Fragment {
 
     private fun dispatchOnWillAppear() {
         dispatchEvent(ScreenLifecycleEvent.WillAppear, this)
-
         dispatchTransitionProgress(0.0f, false)
     }
 
     private fun dispatchOnAppear() {
         dispatchEvent(ScreenLifecycleEvent.Appear, this)
-
         dispatchTransitionProgress(1.0f, false)
     }
 
     private fun dispatchOnWillDisappear() {
         dispatchEvent(ScreenLifecycleEvent.WillDisappear, this)
-
         dispatchTransitionProgress(0.0f, true)
     }
 
     private fun dispatchOnDisappear() {
         dispatchEvent(ScreenLifecycleEvent.Disappear, this)
-
         dispatchTransitionProgress(1.0f, true)
     }
 
@@ -215,20 +208,16 @@ open class ScreenFragment : Fragment {
     }
 
     private fun dispatchEventInChildContainers(event: ScreenLifecycleEvent) {
-        for (sc in mChildScreenContainers) {
-            if (sc.screenCount > 0) {
-                sc.topScreen?.let {
-                    sc.topScreen?.fragment?.let { fragment -> dispatchEvent(event, fragment) }
-                }
-            }
+        mChildScreenContainers.filter { it.screenCount > 0 }.forEach {
+            it.topScreen?.fragment?.let { fragment -> dispatchEvent(event, fragment) }
         }
     }
 
     fun dispatchHeaderBackButtonClickedEvent() {
         val screenContext = screen.context as ReactContext
-        val eventDispatcher: EventDispatcher? =
-            UIManagerHelper.getEventDispatcherForReactTag(screenContext, screen.id)
-        eventDispatcher?.dispatchEvent(HeaderBackButtonClickedEvent(screen.id))
+        UIManagerHelper
+            .getEventDispatcherForReactTag(screenContext, screen.id)
+            ?.dispatchEvent(HeaderBackButtonClickedEvent(screen.id))
     }
 
     fun dispatchTransitionProgress(alpha: Float, closing: Boolean) {
@@ -244,13 +233,13 @@ open class ScreenFragment : Fragment {
                 val container: ScreenContainer<*>? = screen.container
                 val goingForward = if (container is ScreenStack) container.goingForward else false
                 val screenContext = screen.context as ReactContext
-                val eventDispatcher: EventDispatcher? =
-                    UIManagerHelper.getEventDispatcherForReactTag(screenContext, screen.id)
-                eventDispatcher?.dispatchEvent(
-                    ScreenTransitionProgressEvent(
-                        screen.id, mProgress, closing, goingForward, coalescingKey
+                UIManagerHelper
+                    .getEventDispatcherForReactTag(screenContext, screen.id)
+                    ?.dispatchEvent(
+                        ScreenTransitionProgressEvent(
+                            screen.id, mProgress, closing, goingForward, coalescingKey
+                        )
                     )
-                )
             }
         }
     }
@@ -305,9 +294,9 @@ open class ScreenFragment : Fragment {
             // we only send dismissed even when the screen has been removed from its container
             val screenContext = screen.context
             if (screenContext is ReactContext) {
-                val eventDispatcher: EventDispatcher? =
-                    UIManagerHelper.getEventDispatcherForReactTag(screenContext, screen.id)
-                eventDispatcher?.dispatchEvent(ScreenDismissedEvent(screen.id))
+                UIManagerHelper
+                    .getEventDispatcherForReactTag(screenContext, screen.id)
+                    ?.dispatchEvent(ScreenDismissedEvent(screen.id))
             }
         }
         mChildScreenContainers.clear()

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

@@ -5,7 +5,6 @@ import android.graphics.Canvas
 import android.view.View
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.UIManagerHelper
-import com.facebook.react.uimanager.events.EventDispatcher
 import com.swmansion.rnscreens.Screen.StackAnimation
 import com.swmansion.rnscreens.events.StackFinishTransitioningEvent
 import java.util.Collections
@@ -23,6 +22,7 @@ class ScreenStack(context: Context?) : ScreenContainer<ScreenStackFragment>(cont
     private var reverseLastTwoChildren = false
     private var previousChildrenCount = 0
     var goingForward = false
+
     fun dismiss(screenFragment: ScreenStackFragment) {
         mDismissed.add(screenFragment)
         performUpdatesNow()
@@ -30,23 +30,19 @@ class ScreenStack(context: Context?) : ScreenContainer<ScreenStackFragment>(cont
 
     override val topScreen: Screen?
         get() = mTopScreen?.screen
+
     val rootScreen: Screen
         get() {
-            var i = 0
-            val size = screenCount
-            while (i < size) {
+            for (i in 0 until screenCount) {
                 val screen = getScreenAt(i)
                 if (!mDismissed.contains(screen.fragment)) {
                     return screen
                 }
-                i++
             }
             throw IllegalStateException("Stack has no root screen set")
         }
 
-    override fun adapt(screen: Screen): ScreenStackFragment {
-        return ScreenStackFragment(screen)
-    }
+    override fun adapt(screen: Screen) = ScreenStackFragment(screen)
 
     override fun startViewTransition(view: View) {
         super.startViewTransition(view)
@@ -68,16 +64,13 @@ class ScreenStack(context: Context?) : ScreenContainer<ScreenStackFragment>(cont
     }
 
     private fun dispatchOnFinishTransitioning() {
-        val eventDispatcher: EventDispatcher? =
-            UIManagerHelper.getEventDispatcherForReactTag((context as ReactContext), id)
-        eventDispatcher?.dispatchEvent(
-            StackFinishTransitioningEvent(id)
-        )
+        UIManagerHelper
+            .getEventDispatcherForReactTag((context as ReactContext), id)
+            ?.dispatchEvent(StackFinishTransitioningEvent(id))
     }
 
     override fun removeScreenAt(index: Int) {
-        val toBeRemoved = getScreenAt(index)
-        mDismissed.remove(toBeRemoved.fragment)
+        mDismissed.remove(getScreenAt(index).fragment)
         super.removeScreenAt(index)
     }
 
@@ -86,9 +79,8 @@ class ScreenStack(context: Context?) : ScreenContainer<ScreenStackFragment>(cont
         super.removeAllScreens()
     }
 
-    override fun hasScreen(screenFragment: ScreenFragment?): Boolean {
-        return super.hasScreen(screenFragment) && !mDismissed.contains(screenFragment)
-    }
+    override fun hasScreen(screenFragment: ScreenFragment?): Boolean =
+        super.hasScreen(screenFragment) && !mDismissed.contains(screenFragment)
 
     override fun onUpdate() {
         // When going back from a nested stack with a single screen on it, we may hit an edge case
@@ -252,9 +244,7 @@ class ScreenStack(context: Context?) : ScreenContainer<ScreenStackFragment>(cont
     }
 
     override fun notifyContainerUpdate() {
-        for (screen in mStack) {
-            screen.onContainerUpdate()
-        }
+        mStack.forEach { it.onContainerUpdate() }
     }
 
     // below methods are taken from
@@ -310,16 +300,14 @@ class ScreenStack(context: Context?) : ScreenContainer<ScreenStackFragment>(cont
         super.drawChild(op.canvas, op.child, op.drawingTime)
     }
 
-    private fun obtainDrawingOp(): DrawingOp {
-        return if (drawingOpPool.isEmpty()) {
-            DrawingOp()
-        } else drawingOpPool.removeAt(drawingOpPool.size - 1)
-    }
+    private fun obtainDrawingOp(): DrawingOp =
+        if (drawingOpPool.isEmpty()) DrawingOp() else drawingOpPool.removeAt(drawingOpPool.size - 1)
 
     private inner class DrawingOp {
         var canvas: Canvas? = null
         var child: View? = null
         var drawingTime: Long = 0
+
         operator fun set(canvas: Canvas?, child: View?, drawingTime: Long): DrawingOp {
             this.canvas = canvas
             this.child = child
@@ -336,18 +324,11 @@ class ScreenStack(context: Context?) : ScreenContainer<ScreenStackFragment>(cont
     }
 
     companion object {
-        private fun isTransparent(fragment: ScreenStackFragment): Boolean {
-            return (
-                fragment.screen.stackPresentation
-                    === Screen.StackPresentation.TRANSPARENT_MODAL
-                )
-        }
+        private fun isTransparent(fragment: ScreenStackFragment): Boolean =
+            fragment.screen.stackPresentation === Screen.StackPresentation.TRANSPARENT_MODAL
 
-        private fun needsDrawReordering(fragment: ScreenStackFragment): Boolean {
-            return (
-                fragment.screen.stackAnimation === StackAnimation.SLIDE_FROM_BOTTOM ||
-                    fragment.screen.stackAnimation === StackAnimation.FADE_FROM_BOTTOM
-                )
-        }
+        private fun needsDrawReordering(fragment: ScreenStackFragment): Boolean =
+            fragment.screen.stackAnimation === StackAnimation.SLIDE_FROM_BOTTOM ||
+                fragment.screen.stackAnimation === StackAnimation.FADE_FROM_BOTTOM
     }
 }

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

@@ -51,11 +51,9 @@ class ScreenStackFragment : ScreenFragment {
 
     fun setToolbar(toolbar: Toolbar) {
         mAppBarLayout?.addView(toolbar)
-        val params = AppBarLayout.LayoutParams(
+        toolbar.layoutParams = AppBarLayout.LayoutParams(
             AppBarLayout.LayoutParams.MATCH_PARENT, AppBarLayout.LayoutParams.WRAP_CONTENT
-        )
-        params.scrollFlags = 0
-        toolbar.layoutParams = params
+        ).apply { scrollFlags = 0 }
         mToolbar = toolbar
     }
 
@@ -76,8 +74,7 @@ class ScreenStackFragment : ScreenFragment {
     }
 
     override fun onContainerUpdate() {
-        val headerConfig = screen.headerConfig
-        headerConfig?.onUpdate()
+        screen.headerConfig?.onUpdate()
     }
 
     override fun onViewAnimationEnd() {
@@ -99,22 +96,24 @@ class ScreenStackFragment : ScreenFragment {
     ): View? {
         val view: ScreensCoordinatorLayout? =
             context?.let { ScreensCoordinatorLayout(it, this) }
-        val params = CoordinatorLayout.LayoutParams(
+
+        screen.layoutParams = CoordinatorLayout.LayoutParams(
             LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT
-        )
-        params.behavior = if (mIsTranslucent) null else ScrollingViewBehavior()
-        screen.layoutParams = params
+        ).apply { behavior = if (mIsTranslucent) null else ScrollingViewBehavior() }
+
         view?.addView(recycleView(screen))
 
-        mAppBarLayout = context?.let { AppBarLayout(it) }
-        // By default AppBarLayout will have a background color set but since we cover the whole layout
-        // with toolbar (that can be semi-transparent) the bar layout background color does not pay a
-        // role. On top of that it breaks screens animations when alfa offscreen compositing is off
-        // (which is the default)
-        mAppBarLayout?.setBackgroundColor(Color.TRANSPARENT)
-        mAppBarLayout?.layoutParams = AppBarLayout.LayoutParams(
-            AppBarLayout.LayoutParams.MATCH_PARENT, AppBarLayout.LayoutParams.WRAP_CONTENT
-        )
+        mAppBarLayout = context?.let { AppBarLayout(it) }?.apply {
+            // By default AppBarLayout will have a background color set but since we cover the whole layout
+            // with toolbar (that can be semi-transparent) the bar layout background color does not pay a
+            // role. On top of that it breaks screens animations when alfa offscreen compositing is off
+            // (which is the default)
+            setBackgroundColor(Color.TRANSPARENT)
+            layoutParams = AppBarLayout.LayoutParams(
+                AppBarLayout.LayoutParams.MATCH_PARENT, AppBarLayout.LayoutParams.WRAP_CONTENT
+            )
+        }
+
         view?.addView(mAppBarLayout)
         if (mShadowHidden) {
             mAppBarLayout?.targetElevation = 0f
@@ -157,9 +156,10 @@ class ScreenStackFragment : ScreenFragment {
                 searchView = newSearchView
                 onSearchViewCreate?.invoke(newSearchView)
             }
-            val item = menu.add("")
-            item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)
-            item.actionView = searchView
+            menu.add("").apply {
+                setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)
+                actionView = searchView
+            }
         }
     }
 
@@ -213,18 +213,23 @@ class ScreenStackFragment : ScreenFragment {
             // and also this is not necessary when going back since the lifecycle methods
             // are correctly dispatched then.
             // We also add fakeAnimation to the set of animations, which sends the progress of animation
-            val fakeAnimation = ScreensAnimation(mFragment)
-            fakeAnimation.duration = animation.duration
+            val fakeAnimation = ScreensAnimation(mFragment).apply { duration = animation.duration }
+
             if (animation is AnimationSet && !mFragment.isRemoving) {
-                animation.addAnimation(fakeAnimation)
-                animation.setAnimationListener(mAnimationListener)
-                super.startAnimation(animation)
+                animation.apply {
+                    addAnimation(fakeAnimation)
+                    setAnimationListener(mAnimationListener)
+                }.also {
+                    super.startAnimation(it)
+                }
             } else {
-                val set = AnimationSet(true)
-                set.addAnimation(animation)
-                set.addAnimation(fakeAnimation)
-                set.setAnimationListener(mAnimationListener)
-                super.startAnimation(set)
+                AnimationSet(true).apply {
+                    addAnimation(animation)
+                    addAnimation(fakeAnimation)
+                    setAnimationListener(mAnimationListener)
+                }.also {
+                    super.startAnimation(it)
+                }
             }
         }