@@ -5,22 +5,10 @@ const { withMainActivity } = require("expo/config-plugins");
55// onCreate, resetting those metrics; ReactHost resets them on configuration
66// changes too. Rebind after both, before text is measured.
77const DISPLAY_METRICS_METHODS = `
8- // Keep deprecated APIs to match React Native screen metrics on Android 24+.
9- // Physical display metrics omit the configured font scale.
10- @Suppress("DEPRECATION")
11- private fun bindWindowDisplayMetrics() {
12- val windowMetrics = resources.displayMetrics
13- val metrics = DisplayMetrics()
14- metrics.setTo(windowMetrics)
15- windowManager.defaultDisplay.getRealMetrics(metrics)
16- metrics.scaledDensity = windowMetrics.scaledDensity
17- DisplayMetricsHolder.setScreenDisplayMetrics(metrics)
18- }
19-
208 // Expo constructs the root view after onCreate; its constructor resets metrics.
219 override fun setContentView(view: View?) {
2210 super.setContentView(view)
23- bindWindowDisplayMetrics( )
11+ DisplayMetricsHolder.initDisplayMetrics(this )
2412 }
2513` ;
2614
@@ -53,11 +41,10 @@ module.exports = function withAndroidWindowDisplayMetrics(config) {
5341 if ( nextConfig . modResults . language !== "kt" ) {
5442 throw new Error ( "withAndroidWindowDisplayMetrics: MainActivity must be Kotlin." ) ;
5543 }
56- if ( contents . includes ( "bindWindowDisplayMetrics " ) ) {
44+ if ( contents . includes ( "DisplayMetricsHolder.initDisplayMetrics(this) " ) ) {
5745 return nextConfig ;
5846 }
5947
60- contents = addImport ( contents , "import android.util.DisplayMetrics" ) ;
6148 contents = addImport ( contents , "import android.view.View" ) ;
6249 contents = addImport ( contents , "import com.facebook.react.uimanager.DisplayMetricsHolder" ) ;
6350 contents = insertAfter (
@@ -76,7 +63,7 @@ module.exports = function withAndroidWindowDisplayMetrics(config) {
7663 insertAfter (
7764 contents . slice ( overrideStart ) ,
7865 "super.onConfigurationChanged(newConfig)" ,
79- "\n bindWindowDisplayMetrics( )" ,
66+ "\n DisplayMetricsHolder.initDisplayMetrics(this )" ,
8067 "the super call in the onConfigurationChanged override" ,
8168 ) ;
8269 } else {
@@ -87,7 +74,7 @@ module.exports = function withAndroidWindowDisplayMetrics(config) {
8774 `
8875 override fun onConfigurationChanged(newConfig: Configuration) {
8976 super.onConfigurationChanged(newConfig)
90- bindWindowDisplayMetrics( )
77+ DisplayMetricsHolder.initDisplayMetrics(this )
9178 }
9279` ,
9380 "the MainActivity class declaration" ,
0 commit comments