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

package/android/src/main/java/com/swmansion/rnscreens/stack/header/config/StackHeaderConfigViewManager.kt

@@ -1,6 +1,7 @@
 package com.swmansion.rnscreens.stack.header.config
 
 import android.util.Log
+import android.view.Gravity
 import android.view.View
 import com.facebook.react.bridge.Dynamic
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException
@@ -99,7 +100,7 @@ internal open class StackHeaderConfigViewManager :
     override fun onAfterUpdateTransaction(view: StackHeaderConfig) {
         super.onAfterUpdateTransaction(view)
         view.resolveBackButtonIconIfNeeded()
-        view.resolveToolbarMenuItemIconsIfNeeded()
+        view.resolveOverflowIconIfNeeded()
     }
 
     override fun onDropViewInstance(view: StackHeaderConfig) {
@@ -127,6 +128,310 @@ internal open class StackHeaderConfigViewManager :
         view.title = value ?: ""
     }
 
+    override fun setSubtitle(
+        view: StackHeaderConfig,
+        value: String?,
+    ) {
+        view.subtitle = value ?: ""
+    }
+
+    override fun setMaxLines(
+        view: StackHeaderConfig,
+        value: Int,
+    ) {
+        view.maxLines = value.coerceAtLeast(1)
+    }
+
+    override fun setTitleCentered(
+        view: StackHeaderConfig,
+        value: Boolean,
+    ) {
+        view.titleCentered = value
+    }
+
+    override fun setSubtitleCentered(
+        view: StackHeaderConfig,
+        value: Boolean,
+    ) {
+        view.subtitleCentered = value
+    }
+
+    override fun setExpandedTitleHorizontalGravity(
+        view: StackHeaderConfig,
+        value: String?,
+    ) {
+        view.expandedTitleHorizontalGravity = parseHorizontalGravity(value)
+    }
+
+    override fun setExpandedTitleVerticalGravity(
+        view: StackHeaderConfig,
+        value: String?,
+    ) {
+        view.expandedTitleVerticalGravity = parseVerticalGravity(value)
+    }
+
+    override fun setCollapsedTitleHorizontalGravity(
+        view: StackHeaderConfig,
+        value: String?,
+    ) {
+        view.collapsedTitleHorizontalGravity = parseHorizontalGravity(value)
+    }
+
+    override fun setCollapsedTitleVerticalGravity(
+        view: StackHeaderConfig,
+        value: String?,
+    ) {
+        view.collapsedTitleVerticalGravity = parseVerticalGravity(value)
+    }
+
+    override fun setCollapsedTitleGravityMode(
+        view: StackHeaderConfig,
+        value: String?,
+    ) {
+        view.collapsedTitleGravityMode =
+            when (value) {
+                "entireSpace" -> StackHeaderCollapsedTitleGravityMode.ENTIRE_SPACE
+                "availableSpace" -> StackHeaderCollapsedTitleGravityMode.AVAILABLE_SPACE
+                else -> throw JSApplicationIllegalArgumentException(
+                    "[RNScreens] Invalid StackHeaderConfig collapsedTitleGravityMode: $value.",
+                )
+            }
+    }
+
+    // region Header spacing
+    // Spacing arrives as a float defaulting to -1 (unset); 0 is a valid, applied value.
+
+    override fun setContentInsetStart(
+        view: StackHeaderConfig,
+        value: Float,
+    ) {
+        view.contentInsetStart = value.takeIf { it >= 0f }
+    }
+
+    override fun setContentInsetEnd(
+        view: StackHeaderConfig,
+        value: Float,
+    ) {
+        view.contentInsetEnd = value.takeIf { it >= 0f }
+    }
+
+    // endregion
+
+    // region Text appearance
+    // Font size arrives as a float defaulting to -1 (unset); non-positive means "use default".
+
+    override fun setTitleColor(
+        view: StackHeaderConfig,
+        value: Int?,
+    ) {
+        view.titleAppearance.color = value
+    }
+
+    override fun setTitleFontFamily(
+        view: StackHeaderConfig,
+        value: String?,
+    ) {
+        view.titleAppearance.fontFamily = value
+    }
+
+    override fun setTitleFontSize(
+        view: StackHeaderConfig,
+        value: Float,
+    ) {
+        view.titleAppearance.fontSize = value.takeIf { it > 0f }
+    }
+
+    override fun setTitleFontWeight(
+        view: StackHeaderConfig,
+        value: String?,
+    ) {
+        view.titleAppearance.fontWeight = value
+    }
+
+    override fun setTitleFontStyle(
+        view: StackHeaderConfig,
+        value: String?,
+    ) {
+        view.titleAppearance.fontStyle = value
+    }
+
+    override fun setSubtitleColor(
+        view: StackHeaderConfig,
+        value: Int?,
+    ) {
+        view.subtitleAppearance.color = value
+    }
+
+    override fun setSubtitleFontFamily(
+        view: StackHeaderConfig,
+        value: String?,
+    ) {
+        view.subtitleAppearance.fontFamily = value
+    }
+
+    override fun setSubtitleFontSize(
+        view: StackHeaderConfig,
+        value: Float,
+    ) {
+        view.subtitleAppearance.fontSize = value.takeIf { it > 0f }
+    }
+
+    override fun setSubtitleFontWeight(
+        view: StackHeaderConfig,
+        value: String?,
+    ) {
+        view.subtitleAppearance.fontWeight = value
+    }
+
+    override fun setSubtitleFontStyle(
+        view: StackHeaderConfig,
+        value: String?,
+    ) {
+        view.subtitleAppearance.fontStyle = value
+    }
+
+    override fun setExpandedTitleColor(
+        view: StackHeaderConfig,
+        value: Int?,
+    ) {
+        view.expandedTitleAppearance.color = value
+    }
+
+    override fun setExpandedTitleFontFamily(
+        view: StackHeaderConfig,
+        value: String?,
+    ) {
+        view.expandedTitleAppearance.fontFamily = value
+    }
+
+    override fun setExpandedTitleFontSize(
+        view: StackHeaderConfig,
+        value: Float,
+    ) {
+        view.expandedTitleAppearance.fontSize = value.takeIf { it > 0f }
+    }
+
+    override fun setExpandedTitleFontWeight(
+        view: StackHeaderConfig,
+        value: String?,
+    ) {
+        view.expandedTitleAppearance.fontWeight = value
+    }
+
+    override fun setExpandedTitleFontStyle(
+        view: StackHeaderConfig,
+        value: String?,
+    ) {
+        view.expandedTitleAppearance.fontStyle = value
+    }
+
+    override fun setCollapsedTitleColor(
+        view: StackHeaderConfig,
+        value: Int?,
+    ) {
+        view.collapsedTitleAppearance.color = value
+    }
+
+    override fun setCollapsedTitleFontFamily(
+        view: StackHeaderConfig,
+        value: String?,
+    ) {
+        view.collapsedTitleAppearance.fontFamily = value
+    }
+
+    override fun setCollapsedTitleFontSize(
+        view: StackHeaderConfig,
+        value: Float,
+    ) {
+        view.collapsedTitleAppearance.fontSize = value.takeIf { it > 0f }
+    }
+
+    override fun setCollapsedTitleFontWeight(
+        view: StackHeaderConfig,
+        value: String?,
+    ) {
+        view.collapsedTitleAppearance.fontWeight = value
+    }
+
+    override fun setCollapsedTitleFontStyle(
+        view: StackHeaderConfig,
+        value: String?,
+    ) {
+        view.collapsedTitleAppearance.fontStyle = value
+    }
+
+    override fun setExpandedSubtitleColor(
+        view: StackHeaderConfig,
+        value: Int?,
+    ) {
+        view.expandedSubtitleAppearance.color = value
+    }
+
+    override fun setExpandedSubtitleFontFamily(
+        view: StackHeaderConfig,
+        value: String?,
+    ) {
+        view.expandedSubtitleAppearance.fontFamily = value
+    }
+
+    override fun setExpandedSubtitleFontSize(
+        view: StackHeaderConfig,
+        value: Float,
+    ) {
+        view.expandedSubtitleAppearance.fontSize = value.takeIf { it > 0f }
+    }
+
+    override fun setExpandedSubtitleFontWeight(
+        view: StackHeaderConfig,
+        value: String?,
+    ) {
+        view.expandedSubtitleAppearance.fontWeight = value
+    }
+
+    override fun setExpandedSubtitleFontStyle(
+        view: StackHeaderConfig,
+        value: String?,
+    ) {
+        view.expandedSubtitleAppearance.fontStyle = value
+    }
+
+    override fun setCollapsedSubtitleColor(
+        view: StackHeaderConfig,
+        value: Int?,
+    ) {
+        view.collapsedSubtitleAppearance.color = value
+    }
+
+    override fun setCollapsedSubtitleFontFamily(
+        view: StackHeaderConfig,
+        value: String?,
+    ) {
+        view.collapsedSubtitleAppearance.fontFamily = value
+    }
+
+    override fun setCollapsedSubtitleFontSize(
+        view: StackHeaderConfig,
+        value: Float,
+    ) {
+        view.collapsedSubtitleAppearance.fontSize = value.takeIf { it > 0f }
+    }
+
+    override fun setCollapsedSubtitleFontWeight(
+        view: StackHeaderConfig,
+        value: String?,
+    ) {
+        view.collapsedSubtitleAppearance.fontWeight = value
+    }
+
+    override fun setCollapsedSubtitleFontStyle(
+        view: StackHeaderConfig,
+        value: String?,
+    ) {
+        view.collapsedSubtitleAppearance.fontStyle = value
+    }
+
+    // endregion
+
     override fun setHidden(
         view: StackHeaderConfig,
         value: Boolean,
@@ -183,6 +488,41 @@ internal open class StackHeaderConfigViewManager :
         view.backButtonImageIconUri = value?.getString("uri")
     }
 
+    override fun setOverflowIconTintColorNormal(
+        view: StackHeaderConfig,
+        value: Int?,
+    ) {
+        view.overflowIconTintColorNormal = value
+    }
+
+    override fun setOverflowIconTintColorPressed(
+        view: StackHeaderConfig,
+        value: Int?,
+    ) {
+        view.overflowIconTintColorPressed = value
+    }
+
+    override fun setOverflowIconTintColorFocused(
+        view: StackHeaderConfig,
+        value: Int?,
+    ) {
+        view.overflowIconTintColorFocused = value
+    }
+
+    override fun setOverflowIconDrawableIconResourceName(
+        view: StackHeaderConfig,
+        value: String?,
+    ) {
+        view.overflowIconDrawableIconResourceName = value
+    }
+
+    override fun setOverflowIconImageIconResource(
+        view: StackHeaderConfig,
+        value: ReadableMap?,
+    ) {
+        view.overflowIconImageIconUri = value?.getString("uri")
+    }
+
     override fun setScrollFlagScroll(
         view: StackHeaderConfig,
         value: Boolean,
@@ -225,20 +565,39 @@ internal open class StackHeaderConfigViewManager :
         view.liftOnScroll = value
     }
 
+    override fun setBackgroundColor(
+        view: StackHeaderConfig,
+        value: Int?,
+    ) {
+        view.backgroundColor = value
+    }
+
+    override fun setScrolledBackgroundColor(
+        view: StackHeaderConfig,
+        value: Int?,
+    ) {
+        view.scrolledBackgroundColor = value
+    }
+
+    override fun setStatusBarScrimColor(
+        view: StackHeaderConfig,
+        value: Int?,
+    ) {
+        view.statusBarScrimColor = value
+    }
+
     override fun setToolbarMenuGroupDividerEnabled(
         view: StackHeaderConfig,
         value: Boolean,
     ) {
-        view.toolbarMenuGroupDividerEnabled = value
+        view.setToolbarMenuGroupDividerEnabledFromProps(value)
     }
 
     override fun setToolbarMenu(
         view: StackHeaderConfig,
         value: Dynamic,
     ) {
-        val (menu, iconSources) = StackHeaderToolbarMenuMapper.parseMenu(view.context, value)
-        view.toolbarMenu = menu
-        view.toolbarMenuItemIconSourceMap = iconSources
+        view.setToolbarMenuFromProps(StackHeaderToolbarMenuMapper.parseMenu(view.context, value))
     }
 
     override fun updateToolbarMenuElements(
@@ -257,17 +616,31 @@ internal open class StackHeaderConfigViewManager :
                 Log.w(TAG, "[RNScreens] Skipping toolbar menu update at index $i: missing 'id'.")
                 continue
             }
-            parsed.add(
-                StackHeaderToolbarMenuElementRawUpdate(
-                    id,
-                    StackHeaderToolbarMenuMapper.parseMenuElementOptions(view.context, map),
-                    StackHeaderToolbarMenuMapper.parseMenuElementIconSource(map),
-                ),
-            )
+            parsed.add(StackHeaderToolbarMenuMapper.parseElementRawUpdate(view.context, id, map))
         }
         view.dispatchMenuElementUpdates(parsed)
     }
 
+    private fun parseHorizontalGravity(value: String?): Int =
+        when (value) {
+            "start" -> Gravity.START
+            "center" -> Gravity.CENTER_HORIZONTAL
+            "end" -> Gravity.END
+            else -> throw JSApplicationIllegalArgumentException(
+                "[RNScreens] Invalid StackHeaderConfig title horizontal gravity: $value.",
+            )
+        }
+
+    private fun parseVerticalGravity(value: String?): Int =
+        when (value) {
+            "top" -> Gravity.TOP
+            "center" -> Gravity.CENTER_VERTICAL
+            "bottom" -> Gravity.BOTTOM
+            else -> throw JSApplicationIllegalArgumentException(
+                "[RNScreens] Invalid StackHeaderConfig title vertical gravity: $value.",
+            )
+        }
+
     companion object {
         private const val TAG = "StackHeaderConfigViewManager"
         const val REACT_CLASS = "RNSStackHeaderConfigAndroid"

package/android/src/main/java/com/swmansion/rnscreens/stack/header/config/StackHeaderConfigurationObserver.kt

@@ -1,9 +1,8 @@
 package com.swmansion.rnscreens.stack.header.config
 
-import com.swmansion.rnscreens.stack.header.toolbar.update.StackHeaderToolbarMenuElementUpdate
-
-internal interface StackHeaderConfigurationObserver {
-    fun onConfigChanged(config: StackHeaderConfigurationProviding)
-
-    fun onMenuElementsUpdated(updates: List<StackHeaderToolbarMenuElementUpdate>)
+internal fun interface StackHeaderConfigurationObserver {
+    /**
+     * Reports that the parts of the configuration described by [flags] changed.
+     */
+    fun onInvalidated(flags: StackHeaderInvalidationFlags)
 }

package/android/src/main/java/com/swmansion/rnscreens/stack/header/config/StackHeaderConfigurationProviding.kt

@@ -1,12 +1,15 @@
 package com.swmansion.rnscreens.stack.header.config
 
 import android.graphics.drawable.Drawable
+import com.swmansion.rnscreens.common.text.TextAppearance
 import com.swmansion.rnscreens.stack.header.subview.StackHeaderSubviewProviding
-import com.swmansion.rnscreens.stack.header.toolbar.model.StackHeaderToolbarMenuConfig
+import com.swmansion.rnscreens.stack.header.toolbar.StackHeaderToolbarMenuController
 
 internal interface StackHeaderConfigurationProviding {
     val type: StackHeaderType
     val title: String
+    val subtitle: String
+    val maxLines: Int
     val hidden: Boolean
     val transparent: Boolean
     val backButtonHidden: Boolean
@@ -14,23 +17,43 @@ internal interface StackHeaderConfigurationProviding {
     val backButtonTintColorPressed: Int?
     val backButtonTintColorFocused: Int?
     val backButtonIcon: Drawable?
+    val overflowIconTintColorNormal: Int?
+    val overflowIconTintColorPressed: Int?
+    val overflowIconTintColorFocused: Int?
+    val overflowIcon: Drawable?
     val scrollFlagScroll: Boolean
     val scrollFlagEnterAlways: Boolean
     val scrollFlagEnterAlwaysCollapsed: Boolean
     val scrollFlagExitUntilCollapsed: Boolean
     val scrollFlagSnap: Boolean
     val liftOnScroll: Boolean
+    val backgroundColor: Int?
+    val scrolledBackgroundColor: Int?
+    val statusBarScrimColor: Int?
     val leadingSubview: StackHeaderSubviewProviding?
     val centerSubview: StackHeaderSubviewProviding?
     val trailingSubview: StackHeaderSubviewProviding?
     val backgroundSubview: StackHeaderSubviewProviding?
-    val toolbarMenu: StackHeaderToolbarMenuConfig
-    val toolbarMenuGroupDividerEnabled: Boolean
-    val isRTL: Boolean
+    val toolbarMenuController: StackHeaderToolbarMenuController
 
-    val invalidationFlags: StackHeaderInvalidationFlags
+    val titleCentered: Boolean
+    val subtitleCentered: Boolean
+    val expandedTitleHorizontalGravity: Int
+    val expandedTitleVerticalGravity: Int
+    val collapsedTitleHorizontalGravity: Int
+    val collapsedTitleVerticalGravity: Int
+    val collapsedTitleGravityMode: StackHeaderCollapsedTitleGravityMode
 
-    fun clearInvalidationFlags(flags: StackHeaderInvalidationFlags)
+    val contentInsetStart: Float?
+    val contentInsetEnd: Float?
+
+    val titleAppearance: TextAppearance
+    val subtitleAppearance: TextAppearance
+
+    val expandedTitleAppearance: TextAppearance
+    val collapsedTitleAppearance: TextAppearance
+    val expandedSubtitleAppearance: TextAppearance
+    val collapsedSubtitleAppearance: TextAppearance
 
     fun setConfigurationObserver(observer: StackHeaderConfigurationObserver?)
 }

package/android/src/main/java/com/swmansion/rnscreens/stack/header/config/StackHeaderDelegate.kt

@@ -9,13 +9,6 @@ internal interface StackHeaderDelegate {
         contentOffsetY: Int,
     )
 
-    fun onMenuItemClicked(id: String)
-
-    fun onGroupSelectionChanged(
-        groupId: String,
-        selectedIds: List<String>,
-    )
-
     fun onSubviewOriginChanged(
         type: StackHeaderSubviewType,
         x: Int,

package/android/src/main/java/com/swmansion/rnscreens/stack/header/config/StackHeaderInvalidationFlags.kt

@@ -13,19 +13,20 @@ internal value class StackHeaderInvalidationFlags(
         val SCROLL_FLAGS = StackHeaderInvalidationFlags(1 shl 4)
         val TOOLBAR_MENU = StackHeaderInvalidationFlags(1 shl 5)
         val LIFT_ON_SCROLL = StackHeaderInvalidationFlags(1 shl 6)
-
-        val APPEARANCE = TITLE or BACK_BUTTON
-        val ALL = STRUCTURE or SUBVIEWS or APPEARANCE or SCROLL_FLAGS or TOOLBAR_MENU or LIFT_ON_SCROLL
+        val OVERFLOW_ICON = StackHeaderInvalidationFlags(1 shl 7)
+        val TITLE_POSITIONING = StackHeaderInvalidationFlags(1 shl 8)
+        val TITLE_APPEARANCE = StackHeaderInvalidationFlags(1 shl 9)
+        val CONTENT_INSETS = StackHeaderInvalidationFlags(1 shl 10)
+        val BACKGROUND_COLORS = StackHeaderInvalidationFlags(1 shl 11)
+        val ALL =
+            STRUCTURE or SUBVIEWS or TITLE or BACK_BUTTON or SCROLL_FLAGS or TOOLBAR_MENU or LIFT_ON_SCROLL or
+                OVERFLOW_ICON or TITLE_POSITIONING or TITLE_APPEARANCE or CONTENT_INSETS or BACKGROUND_COLORS
     }
 
     infix fun or(other: StackHeaderInvalidationFlags) = StackHeaderInvalidationFlags(raw or other.raw)
 
     fun containsAny(flags: StackHeaderInvalidationFlags) = flags.raw != 0 && (raw and flags.raw) != 0
 
-    fun clearing(flags: StackHeaderInvalidationFlags) = StackHeaderInvalidationFlags(raw and flags.raw.inv())
-
-    val isNotEmpty get() = raw != 0
-
     val isEmpty get() = raw == 0
 
     val needsRebuild get() = containsAny(STRUCTURE or SUBVIEWS)