@@ -13,10 +13,8 @@ import android.util.DisplayMetrics
1313import android.view.WindowManager
1414import androidx.core.view.ViewCompat
1515import androidx.core.view.WindowInsetsCompat
16- import androidx.window.layout.WindowMetricsCalculator
1716import com.facebook.react.bridge.WritableMap
1817import com.facebook.react.bridge.WritableNativeMap
19- import com.facebook.react.views.view.isEdgeToEdgeFeatureFlagOn
2018
2119/* *
2220 * Holds an instance of the current DisplayMetrics so we don't have to thread it through all the
@@ -64,28 +62,16 @@ public object DisplayMetricsHolder {
6462 @JvmStatic
6563 public fun initDisplayMetrics (context : Context ) {
6664 val displayMetrics = context.resources.displayMetrics
67- val windowDisplayMetrics = DisplayMetrics ()
65+ windowDisplayMetrics = displayMetrics
6866 val screenDisplayMetrics = DisplayMetrics ()
69-
70- windowDisplayMetrics.setTo(displayMetrics)
7167 screenDisplayMetrics.setTo(displayMetrics)
72-
73- if (isEdgeToEdgeFeatureFlagOn) {
74- WindowMetricsCalculator .getOrCreate().computeCurrentWindowMetrics(context).let {
75- windowDisplayMetrics.widthPixels = it.bounds.width()
76- windowDisplayMetrics.heightPixels = it.bounds.height()
77- }
78- }
79-
8068 val wm = context.getSystemService(Context .WINDOW_SERVICE ) as WindowManager
8169 // Get the real display metrics if we are using API level 17 or higher.
8270 // The real metrics include system decor elements (e.g. soft menu bar).
8371 //
8472 // See:
8573 // http://developer.android.com/reference/android/view/Display.html#getRealMetrics(android.util.DisplayMetrics)
8674 @Suppress(" DEPRECATION" ) wm.defaultDisplay.getRealMetrics(screenDisplayMetrics)
87-
88- DisplayMetricsHolder .windowDisplayMetrics = windowDisplayMetrics
8975 DisplayMetricsHolder .screenDisplayMetrics = screenDisplayMetrics
9076 }
9177
0 commit comments