From 6a155f3f019851422b7f671dbe19358690a43270 Mon Sep 17 00:00:00 2001 From: Adam Gleitman Date: Mon, 17 Oct 2022 15:05:37 -0700 Subject: [PATCH] RCTUIBaseSizeForDynamicTypeRamp -> RCTBaseSizeForDynamicTypeRamp --- Libraries/Text/RCTTextAttributes.m | 2 +- Libraries/Text/Text/RCTDynamicTypeRamp.h | 2 +- Libraries/Text/Text/RCTDynamicTypeRamp.m | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Libraries/Text/RCTTextAttributes.m b/Libraries/Text/RCTTextAttributes.m index 8e8a26590a100d..b648d7192eb398 100644 --- a/Libraries/Text/RCTTextAttributes.m +++ b/Libraries/Text/RCTTextAttributes.m @@ -227,7 +227,7 @@ - (CGFloat)effectiveFontSizeMultiplier #if !TARGET_OS_OSX // [TODO(macOS GH#774) if (_dynamicTypeRamp != RCTDynamicTypeRampUndefined) { UIFontMetrics *fontMetrics = RCTUIFontMetricsForDynamicTypeRamp(_dynamicTypeRamp); - CGFloat baseSize = RCTUIBaseSizeForDynamicTypeRamp(_dynamicTypeRamp); + CGFloat baseSize = RCTBaseSizeForDynamicTypeRamp(_dynamicTypeRamp); fontSizeMultiplier = [fontMetrics scaledValueForValue:baseSize] / baseSize; } #endif // ]TODO(macOS GH#774) diff --git a/Libraries/Text/Text/RCTDynamicTypeRamp.h b/Libraries/Text/Text/RCTDynamicTypeRamp.h index b936329f0fa617..b79c189ee65785 100644 --- a/Libraries/Text/Text/RCTDynamicTypeRamp.h +++ b/Libraries/Text/Text/RCTDynamicTypeRamp.h @@ -36,5 +36,5 @@ typedef NS_ENUM(NSInteger, RCTDynamicTypeRamp) { /// Generates a `UIFontMetrics` instance representing a particular Dynamic Type ramp. UIFontMetrics * _Nonnull RCTUIFontMetricsForDynamicTypeRamp(RCTDynamicTypeRamp dynamicTypeRamp); /// The "reference" size for a particular font scale ramp, equal to a text element's size under default text size settings. -CGFloat RCTUIBaseSizeForDynamicTypeRamp(RCTDynamicTypeRamp dynamicTypeRamp); +CGFloat RCTBaseSizeForDynamicTypeRamp(RCTDynamicTypeRamp dynamicTypeRamp); #endif // ]TODO(macOS GH#774) diff --git a/Libraries/Text/Text/RCTDynamicTypeRamp.m b/Libraries/Text/Text/RCTDynamicTypeRamp.m index 94f186e5823bb1..bb584cd7d55771 100644 --- a/Libraries/Text/Text/RCTDynamicTypeRamp.m +++ b/Libraries/Text/Text/RCTDynamicTypeRamp.m @@ -51,7 +51,7 @@ @implementation RCTConvert (DynamicTypeRamp) return [UIFontMetrics metricsForTextStyle:textStyle]; } -CGFloat RCTUIBaseSizeForDynamicTypeRamp(RCTDynamicTypeRamp dynamicTypeRamp) { +CGFloat RCTBaseSizeForDynamicTypeRamp(RCTDynamicTypeRamp dynamicTypeRamp) { static NSDictionary *mapping; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{