Skip to content

Commit 651f15f

Browse files
committed
fix(mobile): reuse react native activity display metrics
1 parent f0d728e commit 651f15f

2 files changed

Lines changed: 10 additions & 27 deletions

File tree

‎apps/mobile/plugins/withAndroidWindowDisplayMetrics.cjs‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -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.
77
const 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",

‎apps/mobile/plugins/withAndroidWindowDisplayMetrics.test.mjs‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,25 +60,19 @@ describe("withAndroidWindowDisplayMetrics", () => {
6060
const result = await prebuildMainActivity(template);
6161

6262
expect(methodBody(result, "setContentView")).toMatch(
63-
/^super\.setContentView\(view\)\s+bindWindowDisplayMetrics\(\)$/,
63+
/^super\.setContentView\(view\)\s+DisplayMetricsHolder\.initDisplayMetrics\(this\)$/,
6464
);
6565
expect(methodBody(result, "onConfigurationChanged")).toMatch(
66-
/^super\.onConfigurationChanged\(newConfig\)\s+bindWindowDisplayMetrics\(\)\s+applyTabletOrientation\(\)$/,
66+
/^super\.onConfigurationChanged\(newConfig\)\s+DisplayMetricsHolder\.initDisplayMetrics\(this\)\s+applyTabletOrientation\(\)$/,
6767
);
6868
const onCreate = methodBody(result, "onCreate");
6969
expect(onCreate).toContain("applyTabletOrientation()");
70-
expect(onCreate).not.toContain("bindWindowDisplayMetrics()");
70+
expect(onCreate).not.toContain("DisplayMetricsHolder.initDisplayMetrics(this)");
7171
expect(methodBody(result, "applyTabletOrientation")).toMatch(
7272
/requestedOrientation = if \(resources\.configuration\.smallestScreenWidthDp >= 600\) \{\s+ActivityInfo\.SCREEN_ORIENTATION_FULL_USER\s+\} else \{\s+ActivityInfo\.SCREEN_ORIENTATION_PORTRAIT\s+\}/,
7373
);
7474

75-
const binding = methodBody(result, "bindWindowDisplayMetrics");
76-
expect(binding).toContain("val windowMetrics = resources.displayMetrics");
77-
expect(binding).toMatch(
78-
/metrics\.setTo\(windowMetrics\)\s+windowManager\.defaultDisplay\.getRealMetrics\(metrics\)\s+metrics\.scaledDensity = windowMetrics\.scaledDensity\s+DisplayMetricsHolder\.setScreenDisplayMetrics\(metrics\)/,
79-
);
8075
expect(result).toContain("import android.view.View");
81-
expect(result).toContain("import android.util.DisplayMetrics");
8276
expect(result).toContain("import com.facebook.react.uimanager.DisplayMetricsHolder");
8377
expect(result.match(/^import android\.content\.res\.Configuration$/gm)).toHaveLength(1);
8478
});
@@ -87,7 +81,9 @@ describe("withAndroidWindowDisplayMetrics", () => {
8781
const once = await prebuildMainActivity(template);
8882
const twice = await prebuildMainActivity(once);
8983

90-
expect(methodBody(once, "setContentView")).toContain("bindWindowDisplayMetrics()");
84+
expect(methodBody(once, "setContentView")).toContain(
85+
"DisplayMetricsHolder.initDisplayMetrics(this)",
86+
);
9187
expect(twice).toBe(once);
9288
});
9389
});

0 commit comments

Comments
 (0)