Skip to content

Enable Kotlin warnings as errors in rn_android_library #43755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
NickGerleman wants to merge 2 commits into from
Closed

Enable Kotlin warnings as errors in rn_android_library #43755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff6254a
Fix PixelUtil OSS Build failure (#43754)
NickGerleman Apr 2, 2024
20c6821
Enable Kotlin warnings as errors in rn_android_library
NickGerleman Apr 2, 2024
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
3 changes: 3 additions & 0 deletions ...enu-android/android/src/main/java/com/facebook/react/popupmenu/PopupMenuSelectionEvent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
* LICENSE file in the root directory of this source tree.
*/

// Deprecated usage inc imports of RCTEventEmitter
@file:Suppress("DEPRECATION")

package com.facebook.react.popupmenu

import com.facebook.react.bridge.Arguments
Expand Down
12 changes: 7 additions & 5 deletions packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
package com.facebook.react.uimanager

import android.util.TypedValue
import kotlin.math.min

/** Android dp to pixel manipulation */
public object PixelUtil {
Expand All @@ -29,12 +30,13 @@ public object PixelUtil {
@JvmStatic
public fun toPixelFromSP(value: Float, maxFontScale: Float = Float.NaN): Float {
val displayMetrics = DisplayMetricsHolder.getWindowDisplayMetrics()
var scaledDensity = displayMetrics.scaledDensity
val currentFontScale = scaledDensity / displayMetrics.density
if (maxFontScale >= 1 && maxFontScale < currentFontScale) {
scaledDensity = displayMetrics.density * maxFontScale
val scaledValue = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, value, displayMetrics)

if (maxFontScale >= 1) {
return min(scaledValue, value * displayMetrics.density * maxFontScale)
}
return value * scaledDensity

return scaledValue
}

/** Convert from SP to PX */
Expand Down