Skip to content

Commit 1d5bbf1

Browse files
cortinicofacebook-github-bot
authored andcommitted
Cleanup several warnings inside DisplayMetricsHolder (facebook#51074)
Summary: Pull Request resolved: facebook#51074 While working on this class I noticed there are a number of warnings. Let's clean them up. Changelog: [Internal] [Changed] - Reviewed By: mdvacca Differential Revision: D74001269 fbshipit-source-id: 7e86ffdaf9c82ff5a165618813fa700f8e850a74
1 parent 2c1726a commit 1d5bbf1

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public object DisplayMetricsHolder {
2727
/** The metrics of the window associated to the Context used to initialize ReactNative */
2828
@JvmStatic
2929
public fun getWindowDisplayMetrics(): DisplayMetrics {
30-
checkNotNull(windowDisplayMetrics) { DisplayMetricsHolder.INITIALIZATION_MISSING_MESSAGE }
30+
checkNotNull(windowDisplayMetrics) { INITIALIZATION_MISSING_MESSAGE }
3131
return windowDisplayMetrics as DisplayMetrics
3232
}
3333

@@ -39,7 +39,7 @@ public object DisplayMetricsHolder {
3939
/** Screen metrics returns the metrics of the default screen on the device. */
4040
@JvmStatic
4141
public fun getScreenDisplayMetrics(): DisplayMetrics {
42-
checkNotNull(screenDisplayMetrics) { DisplayMetricsHolder.INITIALIZATION_MISSING_MESSAGE }
42+
checkNotNull(screenDisplayMetrics) { INITIALIZATION_MISSING_MESSAGE }
4343
return screenDisplayMetrics as DisplayMetrics
4444
}
4545

@@ -63,7 +63,6 @@ public object DisplayMetricsHolder {
6363
val screenDisplayMetrics = DisplayMetrics()
6464
screenDisplayMetrics.setTo(displayMetrics)
6565
val wm = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
66-
checkNotNull(wm) { "WindowManager is null!" }
6766
// Get the real display metrics if we are using API level 17 or higher.
6867
// The real metrics include system decor elements (e.g. soft menu bar).
6968
//
@@ -75,8 +74,8 @@ public object DisplayMetricsHolder {
7574

7675
@JvmStatic
7776
public fun getDisplayMetricsWritableMap(fontScale: Double): WritableMap {
78-
checkNotNull(windowDisplayMetrics) { DisplayMetricsHolder.INITIALIZATION_MISSING_MESSAGE }
79-
checkNotNull(screenDisplayMetrics) { DisplayMetricsHolder.INITIALIZATION_MISSING_MESSAGE }
77+
checkNotNull(windowDisplayMetrics) { INITIALIZATION_MISSING_MESSAGE }
78+
checkNotNull(screenDisplayMetrics) { INITIALIZATION_MISSING_MESSAGE }
8079

8180
return WritableNativeMap().apply {
8281
putMap(

0 commit comments

Comments
 (0)