Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ fun makeTitleAtMostWidthMeasureSpec(containerWidth: Int, rightBarWidth: Int, lef

fun resolveVerticalTitleBoundsLimit(
parentHeight: Int,
titleHeight: Int,
titleHeight: Int
): Pair<TitleTop, TitleBottom> {
return (parentHeight / 2f - titleHeight / 2f).roundToInt() to (parentHeight / 2f + titleHeight / 2f).roundToInt()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceMa
// It's causing infinite measurements, that hung up the UI.
// Intercepting largest child by width, and use its width as (parent) ReactRootView width fixed that.
// See for more details https://github.com/wix/react-native-navigation/pull/7096
val measuredWidth = this.children.maxByOrNull { it.measuredWidth }?.measuredWidth ?: 0
val measuredWidth = this.children.maxBy { it.measuredWidth }?.measuredWidth?:0
return if (measuredWidth > 0) MeasureSpec.makeMeasureSpec(measuredWidth, MeasureSpec.EXACTLY) else
widthMeasureSpec
}
Expand Down
2 changes: 1 addition & 1 deletion playground/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

buildscript {
ext {
kotlinVersion = "1.4.20"
kotlinVersion = "1.3.72"
RNNKotlinVersion = kotlinVersion
detoxKotlinVersion = kotlinVersion
}
Expand Down