-
-
Notifications
You must be signed in to change notification settings - Fork 534
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Android: Sync with React Native v0.20.0 * Sync iOS with React Native v0.20.0 * resetPaymentSheetCustomer for iOS * fix integration tests * add missing type * increase timeout for github action * sync dart layer * BREAKING add onDidSetShippingContact to presentapplepay * add onDidSetShippingMethod callback for handling shipping methods * chore: add changelog, increase version Co-authored-by: Remon <[email protected]>
- Loading branch information
Showing
56 changed files
with
2,041 additions
and
300 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
89 changes: 89 additions & 0 deletions
89
...pe_android/android/src/main/kotlin/com/facebook/react/uimanager/DisplayMetricsHolder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| /* | ||
| * Copyright (c) Meta Platforms, Inc. and affiliates. | ||
| * | ||
| * This source code is licensed under the MIT license found in the | ||
| * LICENSE file in the root directory of this source tree. | ||
| */ | ||
|
|
||
| package com.facebook.react.uimanager; | ||
|
|
||
| import android.content.Context; | ||
| import android.util.DisplayMetrics; | ||
| import android.view.Display; | ||
| import android.view.WindowManager; | ||
| import androidx.annotation.Nullable; | ||
| import com.facebook.react.bridge.WritableMap; | ||
| import com.facebook.react.bridge.WritableNativeMap; | ||
|
|
||
| /** | ||
| * Holds an instance of the current DisplayMetrics so we don't have to thread it through all the | ||
| * classes that need it. | ||
| */ | ||
| public class DisplayMetricsHolder { | ||
|
|
||
| private static @Nullable DisplayMetrics sWindowDisplayMetrics; | ||
| private static @Nullable DisplayMetrics sScreenDisplayMetrics; | ||
|
|
||
| public static void setWindowDisplayMetrics(DisplayMetrics displayMetrics) { | ||
| sWindowDisplayMetrics = displayMetrics; | ||
| } | ||
|
|
||
| public static void initDisplayMetricsIfNotInitialized(Context context) { | ||
| if (DisplayMetricsHolder.getScreenDisplayMetrics() != null) { | ||
| return; | ||
| } | ||
| initDisplayMetrics(context); | ||
| } | ||
|
|
||
| public static void initDisplayMetrics(Context context) { | ||
| DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics(); | ||
| DisplayMetricsHolder.setWindowDisplayMetrics(displayMetrics); | ||
|
|
||
| DisplayMetrics screenDisplayMetrics = new DisplayMetrics(); | ||
| screenDisplayMetrics.setTo(displayMetrics); | ||
| WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE); | ||
| Display display = wm.getDefaultDisplay(); | ||
|
|
||
| // Get the real display metrics if we are using API level 17 or higher. | ||
| // The real metrics include system decor elements (e.g. soft menu bar). | ||
| // | ||
| // See: | ||
| // http://developer.android.com/reference/android/view/Display.html#getRealMetrics(android.util.DisplayMetrics) | ||
| display.getRealMetrics(screenDisplayMetrics); | ||
| DisplayMetricsHolder.setScreenDisplayMetrics(screenDisplayMetrics); | ||
| } | ||
|
|
||
| /** Returns the metrics of the window associated to the Context used to initialize ReactNative */ | ||
| public static DisplayMetrics getWindowDisplayMetrics() { | ||
| return sWindowDisplayMetrics; | ||
| } | ||
|
|
||
| public static void setScreenDisplayMetrics(DisplayMetrics screenDisplayMetrics) { | ||
| sScreenDisplayMetrics = screenDisplayMetrics; | ||
| } | ||
|
|
||
| /** Screen metrics returns the metrics of the default screen on the device. */ | ||
| public static DisplayMetrics getScreenDisplayMetrics() { | ||
| return sScreenDisplayMetrics; | ||
| } | ||
|
|
||
| public static WritableMap getDisplayMetricsWritableMap(double fontScale) { | ||
| final WritableNativeMap result = new WritableNativeMap(); | ||
| result.putMap( | ||
| "windowPhysicalPixels", getPhysicalPixelsWritableMap(sWindowDisplayMetrics, fontScale)); | ||
| result.putMap( | ||
| "screenPhysicalPixels", getPhysicalPixelsWritableMap(sScreenDisplayMetrics, fontScale)); | ||
| return result; | ||
| } | ||
|
|
||
| private static WritableMap getPhysicalPixelsWritableMap( | ||
| DisplayMetrics displayMetrics, double fontScale) { | ||
| final WritableNativeMap result = new WritableNativeMap(); | ||
| result.putInt("width", displayMetrics.widthPixels); | ||
| result.putInt("height", displayMetrics.heightPixels); | ||
| result.putDouble("scale", displayMetrics.density); | ||
| result.putDouble("fontScale", fontScale); | ||
| result.putDouble("densityDpi", displayMetrics.densityDpi); | ||
| return result; | ||
| } | ||
| } |
Oops, something went wrong.