@@ -13,10 +13,8 @@ import android.util.DisplayMetrics
13
13
import android.view.WindowManager
14
14
import androidx.core.view.ViewCompat
15
15
import androidx.core.view.WindowInsetsCompat
16
- import androidx.window.layout.WindowMetricsCalculator
17
16
import com.facebook.react.bridge.WritableMap
18
17
import com.facebook.react.bridge.WritableNativeMap
19
- import com.facebook.react.views.view.isEdgeToEdgeFeatureFlagOn
20
18
21
19
/* *
22
20
* 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 {
64
62
@JvmStatic
65
63
public fun initDisplayMetrics (context : Context ) {
66
64
val displayMetrics = context.resources.displayMetrics
67
- val windowDisplayMetrics = DisplayMetrics ()
65
+ windowDisplayMetrics = displayMetrics
68
66
val screenDisplayMetrics = DisplayMetrics ()
69
-
70
- windowDisplayMetrics.setTo(displayMetrics)
71
67
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
-
80
68
val wm = context.getSystemService(Context .WINDOW_SERVICE ) as WindowManager
81
69
// Get the real display metrics if we are using API level 17 or higher.
82
70
// The real metrics include system decor elements (e.g. soft menu bar).
83
71
//
84
72
// See:
85
73
// http://developer.android.com/reference/android/view/Display.html#getRealMetrics(android.util.DisplayMetrics)
86
74
@Suppress(" DEPRECATION" ) wm.defaultDisplay.getRealMetrics(screenDisplayMetrics)
87
-
88
- DisplayMetricsHolder .windowDisplayMetrics = windowDisplayMetrics
89
75
DisplayMetricsHolder .screenDisplayMetrics = screenDisplayMetrics
90
76
}
91
77
0 commit comments