GitHub/divkit
1
0
Fork 0
mirror of https://github.com/divkit/divkit.git synced 2026-06-06 20:07:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed FontFamily enum

Browse Source
This commit is contained in:
pkurchatov
2023-06-30 11:40:59 +03:00
parent ed9a4d7367
commit f34edb331c
36 changed files with 286 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/ios/DivKit.xcodeproj/project.pbxproj
+17 -9
View File
@@ -44,7 +44,6 @@
8C0E7371288AE219009BEB3C /* DivKit in Frameworks */ = {isa = PBXBuildFile; productRef = 8C0E7370288AE219009BEB3C /* DivKit */; };
8C0E7373288AE563009BEB3C /* snapshot_test_data in Resources */ = {isa = PBXBuildFile; fileRef = 8C0E7372288AE563009BEB3C /* snapshot_test_data */; };
8C0E7375288AE576009BEB3C /* production_data in Resources */ = {isa = PBXBuildFile; fileRef = 8C0E7374288AE576009BEB3C /* production_data */; };
8C0E7381288AE9BB009BEB3C /* FontProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C0E7380288AE9BB009BEB3C /* FontProvider.swift */; };
8C0E7395288AEF18009BEB3C /* YSText-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8C0E7391288AEF18009BEB3C /* YSText-Medium.ttf */; };
8C0E7396288AEF18009BEB3C /* YSText-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8C0E7392288AEF18009BEB3C /* YSText-Light.ttf */; };
8C0E7397288AEF18009BEB3C /* YSText-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8C0E7393288AEF18009BEB3C /* YSText-Regular.ttf */; };
@@ -197,11 +196,14 @@
8C9284FA288ADEEA00BEA1FA /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C9284F9288ADEEA00BEA1FA /* AppDelegate.swift */; };
8C9284FE288ADEEA00BEA1FA /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C9284FD288ADEEA00BEA1FA /* ViewController.swift */; };
8C928503288ADEEA00BEA1FA /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8C928502288ADEEA00BEA1FA /* Assets.xcassets */; };
8C9898402A4C570400FDC858 /* YSFontProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C0E7380288AE9BB009BEB3C /* YSFontProvider.swift */; };
8C9898422A4C59DF00FDC858 /* YSFontProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C9898412A4C59DF00FDC858 /* YSFontProvider.swift */; };
8CA382DF287C5CF000C99F4F /* DivKitExtensions in Frameworks */ = {isa = PBXBuildFile; productRef = 8CA382DE287C5CF000C99F4F /* DivKitExtensions */; };
8CB960E428883B8300D16E47 /* DivTriggerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CB960E328883B8300D16E47 /* DivTriggerTests.swift */; };
8CB960E628883B8E00D16E47 /* Platform.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CB960E528883B8E00D16E47 /* Platform.swift */; };
8CB960E828883B9A00D16E47 /* FunctionSignaturesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CB960E728883B9A00D16E47 /* FunctionSignaturesTests.swift */; };
8CD1521028CF217B0061128B /* ExpressionResolverTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1520F28CF217B0061128B /* ExpressionResolverTests.swift */; };
8CD907BB2A4C8AF3001C4B7B /* StringUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CD907BA2A4C8AF3001C4B7B /* StringUtils.swift */; };
8CF1296128B0018E00351F65 /* UrlInputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CF1296028B0018E00351F65 /* UrlInputView.swift */; };
8CF1296328B0021F00351F65 /* UserPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CF1296228B0021F00351F65 /* UserPreferences.swift */; };
8CF1296528B0036F00351F65 /* Themes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CF1296428B0036F00351F65 /* Themes.swift */; };
@@ -279,7 +281,7 @@
8C0DC7112865CA1100286F6B /* DivKitTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DivKitTests.swift; sourceTree = "<group>"; };
8C0E7372288AE563009BEB3C /* snapshot_test_data */ = {isa = PBXFileReference; lastKnownFileType = folder; name = snapshot_test_data; path = ../../../test_data/snapshot_test_data; sourceTree = "<group>"; };
8C0E7374288AE576009BEB3C /* production_data */ = {isa = PBXFileReference; lastKnownFileType = folder; name = production_data; path = ../../../test_data/production_data; sourceTree = "<group>"; };
8C0E7380288AE9BB009BEB3C /* FontProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FontProvider.swift; sourceTree = "<group>"; };
8C0E7380288AE9BB009BEB3C /* YSFontProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YSFontProvider.swift; sourceTree = "<group>"; };
8C0E7391288AEF18009BEB3C /* YSText-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "YSText-Medium.ttf"; sourceTree = "<group>"; };
8C0E7392288AEF18009BEB3C /* YSText-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "YSText-Light.ttf"; sourceTree = "<group>"; };
8C0E7393288AEF18009BEB3C /* YSText-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "YSText-Regular.ttf"; sourceTree = "<group>"; };
@@ -444,10 +446,12 @@
8C9284FD288ADEEA00BEA1FA /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
8C928502288ADEEA00BEA1FA /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
8C928507288ADEEA00BEA1FA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8C9898412A4C59DF00FDC858 /* YSFontProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YSFontProvider.swift; sourceTree = "<group>"; };
8CB960E328883B8300D16E47 /* DivTriggerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DivTriggerTests.swift; sourceTree = "<group>"; };
8CB960E528883B8E00D16E47 /* Platform.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Platform.swift; sourceTree = "<group>"; };
8CB960E728883B9A00D16E47 /* FunctionSignaturesTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FunctionSignaturesTests.swift; sourceTree = "<group>"; };
8CD1520F28CF217B0061128B /* ExpressionResolverTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExpressionResolverTests.swift; sourceTree = "<group>"; };
8CD907BA2A4C8AF3001C4B7B /* StringUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringUtils.swift; sourceTree = "<group>"; };
8CF1296028B0018E00351F65 /* UrlInputView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UrlInputView.swift; sourceTree = "<group>"; };
8CF1296228B0021F00351F65 /* UserPreferences.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserPreferences.swift; sourceTree = "<group>"; };
8CF1296428B0036F00351F65 /* Themes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Themes.swift; sourceTree = "<group>"; };
@@ -833,6 +837,7 @@
8C88636028AB802C00D04928 /* ReferenceSet.swift */,
8C6E40BB28AAA4F30038E107 /* SwitchableContainerSnapshotTest.swift */,
8C6E40BD28AAA4F30038E107 /* TooltipFactorySnapshotTests.swift */,
8C9898412A4C59DF00FDC858 /* YSFontProvider.swift */,
);
path = LayoutKitSnapshotTests;
sourceTree = "<group>";
@@ -867,12 +872,13 @@
8C7B18832864CA380036EF4C /* Alert.swift */,
8C1A376828B41BA000A047C8 /* DemoAppLogger.swift */,
8C1A374828B4187B00A047C8 /* DeviceInfo.swift */,
89D02B1928C8EBC40041EC18 /* Palette.swift */,
E9E484C029AF434D00C803A8 /* RegressionFile.swift */,
8C2BFA5728C10F5B00A16E9B /* TestData.swift */,
893D19632902AD8F005540DF /* TimeMeasure.swift */,
8C7B18842864CA380036EF4C /* UrlOpener.swift */,
8CF1296228B0021F00351F65 /* UserPreferences.swift */,
89D02B1928C8EBC40041EC18 /* Palette.swift */,
893D19632902AD8F005540DF /* TimeMeasure.swift */,
E9E484C029AF434D00C803A8 /* RegressionFile.swift */,
8CD907BA2A4C8AF3001C4B7B /* StringUtils.swift */,
);
path = Utils;
sourceTree = "<group>";
@@ -1004,12 +1010,13 @@
8C9284CE288ACCE400BEA1FA /* SnapshotTestKit */,
8C035199288EC5AB0016A747 /* Images.xcassets */,
8C9284D9288ACCE400BEA1FA /* DivIndicatorTests.swift */,
E94B516428D0AC7900AFACEA /* DivInteractiveSnapshotTests.swift */,
8C9284D6288ACCE400BEA1FA /* DivKitSnapshotTestCase.swift */,
8C9284D4288ACCE400BEA1FA /* DivSnapshotTests.swift */,
8C9284D7288ACCE400BEA1FA /* MordaProductionTests.swift */,
8C9284D5288ACCE400BEA1FA /* ReferenceSet.swift */,
8C9284D3288ACCE400BEA1FA /* RuntimeTestCase.swift */,
E94B516428D0AC7900AFACEA /* DivInteractiveSnapshotTests.swift */,
8C0E7380288AE9BB009BEB3C /* YSFontProvider.swift */,
);
path = DivKitSnapshotTests;
sourceTree = "<group>";
@@ -1018,9 +1025,9 @@
isa = PBXGroup;
children = (
8C9284CF288ACCE400BEA1FA /* Diff.swift */,
8C9284D2288ACCE400BEA1FA /* ScreenSize.swift */,
8C9284D0288ACCE400BEA1FA /* Snapshot.swift */,
8C9284D1288ACCE400BEA1FA /* SnapshotTestKit.swift */,
8C9284D2288ACCE400BEA1FA /* ScreenSize.swift */,
);
path = SnapshotTestKit;
sourceTree = "<group>";
@@ -1032,7 +1039,6 @@
8C928502288ADEEA00BEA1FA /* Assets.xcassets */,
8C928507288ADEEA00BEA1FA /* Info.plist */,
8C9284F9288ADEEA00BEA1FA /* AppDelegate.swift */,
8C0E7380288AE9BB009BEB3C /* FontProvider.swift */,
8C9284FD288ADEEA00BEA1FA /* ViewController.swift */,
8C0C0766288FE8F30052C4A9 /* Main.storyboard */,
);
@@ -1551,6 +1557,7 @@
8C4504DC28B3AA30005712FD /* SamplesView.swift in Sources */,
8C1A383228B61A2B00A047C8 /* AppComponents.swift in Sources */,
8CF1296128B0018E00351F65 /* UrlInputView.swift in Sources */,
8CD907BB2A4C8AF3001C4B7B /* StringUtils.swift in Sources */,
8C1A377B28B4E3E700A047C8 /* Payload.swift in Sources */,
8C1A376D28B4DC2400A047C8 /* SettingsView.swift in Sources */,
8C1A378028B4E47900A047C8 /* WebPreviewSocket.swift in Sources */,
@@ -1577,6 +1584,7 @@
8C88636128AB802C00D04928 /* ReferenceSet.swift in Sources */,
8C6E40BF28AAA4F30038E107 /* SwitchableContainerSnapshotTest.swift in Sources */,
8C6E40C128AAA4F30038E107 /* TooltipFactorySnapshotTests.swift in Sources */,
8C9898422A4C59DF00FDC858 /* YSFontProvider.swift in Sources */,
8C6E40C028AAA4F30038E107 /* AnchorBlockTests.swift in Sources */,
8C6E40CD28AAA6F30038E107 /* Snapshot.swift in Sources */,
);
@@ -1690,6 +1698,7 @@
8C9284E0288ACCE400BEA1FA /* ReferenceSet.swift in Sources */,
8C9284DD288ACCE400BEA1FA /* ScreenSize.swift in Sources */,
8C9284DE288ACCE400BEA1FA /* RuntimeTestCase.swift in Sources */,
8C9898402A4C570400FDC858 /* YSFontProvider.swift in Sources */,
8C9284E1288ACCE400BEA1FA /* DivKitSnapshotTestCase.swift in Sources */,
8C9284DB288ACCE400BEA1FA /* Snapshot.swift in Sources */,
8C9284E2288ACCE400BEA1FA /* MordaProductionTests.swift in Sources */,
@@ -1702,7 +1711,6 @@
buildActionMask = 2147483647;
files = (
8C9284FE288ADEEA00BEA1FA /* ViewController.swift in Sources */,
8C0E7381288AE9BB009BEB3C /* FontProvider.swift in Sources */,
8C9284FA288ADEEA00BEA1FA /* AppDelegate.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
client/ios/DivKit/Debug/Block+DebugInfo.swift
+5 -7
View File
@@ -6,15 +6,13 @@ import CommonCorePublic
import LayoutKit
extension Block {
func addingDebugInfo(
debugParams: DebugParams,
errors: [DivError],
parentPath: UIElementPath
) -> Block {
func addingDebugInfo(context: DivBlockModelingContext) -> Block {
let debugParams = context.debugParams
guard debugParams.isDebugInfoEnabled else {
return self
}
let errors = context.errorsStorage.errors
let errorsCount = errors.count
guard errorsCount > 0 else {
return self
@@ -24,12 +22,12 @@ extension Block {
? "\(maxCount)+"
: "\(errorsCount)"
let typo = Typo(size: FontSize(rawValue: 14), weight: .regular)
let typo = Typo(font: context.fontProvider.font(size: 14))
.with(color: .white)
let action = UserInterfaceAction(
payload: .url(DebugInfoBlock.showOverlayURL),
path: parentPath + "div_errors_indicator",
path: context.parentPath + "div_errors_indicator",
accessibilityElement: nil
)
client/ios/DivKit/DivBlockModelingContext.swift
+3 -3
View File
@@ -18,7 +18,7 @@ public struct DivBlockModelingContext {
public let imageHolderFactory: ImageHolderFactory
public let highPriorityImageHolderFactory: ImageHolderFactory?
public let divCustomBlockFactory: DivCustomBlockFactory
public let fontSpecifiers: FontSpecifiers
public let fontProvider: DivFontProvider
public let flagsInfo: DivFlagsInfo
public let extensionHandlers: [String: DivExtensionHandler]
public let stateInterceptors: [String: DivStateInterceptor]
@@ -51,7 +51,7 @@ public struct DivBlockModelingContext {
imageHolderFactory: ImageHolderFactory,
highPriorityImageHolderFactory: ImageHolderFactory? = nil,
divCustomBlockFactory: DivCustomBlockFactory = EmptyDivCustomBlockFactory(),
fontSpecifiers: FontSpecifiers = BaseUIPublic.fontSpecifiers,
fontProvider: DivFontProvider? = nil,
flagsInfo: DivFlagsInfo = .default,
extensionHandlers: [DivExtensionHandler] = [],
stateInterceptors: [DivStateInterceptor] = [],
@@ -74,7 +74,7 @@ public struct DivBlockModelingContext {
self.highPriorityImageHolderFactory = highPriorityImageHolderFactory
self.divCustomBlockFactory = divCustomBlockFactory
self.flagsInfo = flagsInfo
self.fontSpecifiers = fontSpecifiers
self.fontProvider = fontProvider ?? DefaultFontProvider()
self.playerFactory = playerFactory
self.debugParams = debugParams
self.childrenA11yDescription = childrenA11yDescription
client/ios/DivKit/DivFontProvider.swift
+36
View File
@@ -0,0 +1,36 @@
import CoreGraphics
import BasePublic
import BaseUIPublic
public protocol DivFontProvider {
func font(family: String, weight: DivFontWeight, size: CGFloat) -> Font
}
extension DivFontProvider {
public func font(weight: DivFontWeight = .regular, size: CGFloat) -> Font {
font(family: "", weight: weight, size: size)
}
}
final class DefaultFontProvider: DivFontProvider {
func font(family: String, weight: DivFontWeight, size: CGFloat) -> Font {
let fontSpecifier = family == "display" ? fontSpecifiers.display : fontSpecifiers.text
return fontSpecifier.font(weight: weight.baseUIFontWeight, size: size)
}
}
extension DivFontWeight {
fileprivate var baseUIFontWeight: BaseUIPublic.FontWeight {
switch self {
case .light:
return .light
case .regular:
return .regular
case .medium:
return .medium
case .bold:
return .bold
}
}
}
client/ios/DivKit/DivKitComponents.swift
+4 -4
View File
@@ -14,7 +14,7 @@ public final class DivKitComponents {
public let divCustomBlockFactory: DivCustomBlockFactory
public var extensionHandlers: [DivExtensionHandler]
public let flagsInfo: DivFlagsInfo
public let fontSpecifiers: FontSpecifiers
public let fontProvider: DivFontProvider
public let imageHolderFactory: ImageHolderFactory
public let patchProvider: DivPatchProvider
public let playerFactory: PlayerFactory?
@@ -34,7 +34,7 @@ public final class DivKitComponents {
divCustomBlockFactory: DivCustomBlockFactory = EmptyDivCustomBlockFactory(),
extensionHandlers: [DivExtensionHandler] = [],
flagsInfo: DivFlagsInfo = .default,
fontSpecifiers: FontSpecifiers = BaseUIPublic.fontSpecifiers,
fontProvider: DivFontProvider? = nil,
imageHolderFactory: ImageHolderFactory? = nil,
patchProvider: DivPatchProvider? = nil,
requestPerformer: URLRequestPerforming? = nil,
@@ -50,7 +50,7 @@ public final class DivKitComponents {
self.divCustomBlockFactory = divCustomBlockFactory
self.extensionHandlers = extensionHandlers
self.flagsInfo = flagsInfo
self.fontSpecifiers = fontSpecifiers
self.fontProvider = fontProvider ?? DefaultFontProvider()
self.playerFactory = playerFactory ?? defaultPlayerFactory
self.showToolip = showTooltip
self.stateManagement = stateManagement
@@ -180,7 +180,7 @@ public final class DivKitComponents {
imageHolderFactory: imageHolderFactory
.withInMemoryCache(cachedImageHolders: cachedImageHolders),
divCustomBlockFactory: divCustomBlockFactory,
fontSpecifiers: fontSpecifiers,
fontProvider: fontProvider,
flagsInfo: flagsInfo,
extensionHandlers: extensionHandlers,
variables: variablesStorage.makeVariables(for: cardId),
client/ios/DivKit/Extensions/DivData/DivDataExtensions.swift
+1 -5
View File
@@ -36,11 +36,7 @@ extension DivData: DivBlockModeling {
.addingStateBlock(
ids: stateManager.getVisibleIds(statePath: statePath)
)
.addingDebugInfo(
debugParams: divContext.debugParams,
errors: divContext.errorsStorage.errors,
parentPath: divContext.parentPath
)
.addingDebugInfo(context: divContext)
}
private func getCurrentState(
client/ios/DivKit/Extensions/DivFontWeightExtensions.swift
+2 -13
View File
@@ -1,7 +1,7 @@
import BaseUIPublic
import BasePublic
extension DivFontWeight {
var fontWeight: FontWeight {
var fontWeight: Font.Weight {
switch self {
case .light:
return .light
@@ -14,14 +14,3 @@ extension DivFontWeight {
}
}
}
extension DivFontFamily {
var fontFamily: FontFamily {
switch self {
case .display:
return .YSDisplay
case .text:
return .YSText
}
}
}
client/ios/DivKit/Extensions/DivInputExtensions.swift
+19 -34
View File
@@ -19,39 +19,27 @@ extension DivInput: DivBlockModeling {
}
private func makeBaseBlock(context: DivBlockModelingContext) throws -> Block {
let font = context.fontSpecifiers.font(
family: resolveFontFamily(context.expressionResolver).fontFamily,
weight: resolveFontWeight(context.expressionResolver).fontWeight,
size: resolveFontSizeUnit(context.expressionResolver)
.makeScaledValue(resolveFontSize(context.expressionResolver))
let expressionResolver = context.expressionResolver
let font = context.fontProvider.font(
family: resolveFontFamily(expressionResolver) ?? "",
weight: resolveFontWeight(expressionResolver),
size: resolveFontSizeUnit(expressionResolver)
.makeScaledValue(resolveFontSize(expressionResolver))
)
var typo = Typo(font: font).allowHeightOverrun
let kern = CGFloat(resolveLetterSpacing(context.expressionResolver))
let kern = CGFloat(resolveLetterSpacing(expressionResolver))
if !kern.isApproximatelyEqualTo(0) {
typo = typo.kerned(kern)
}
if let lineHeight = resolveLineHeight(context.expressionResolver) {
if let lineHeight = resolveLineHeight(expressionResolver) {
typo = typo.with(height: CGFloat(lineHeight))
}
let resolvedHintColor: Color = resolveHintColor(context.expressionResolver)
let hintTypo = typo.with(color: resolvedHintColor)
let hintValue = resolveHintText(context.expressionResolver) ?? ""
let resolvedColor: Color = resolveTextColor(context.expressionResolver)
let textTypo = typo.with(color: resolvedColor)
let textValue = Binding<String>(context: context, name: textVariable)
let highlightColor = resolveHighlightColor(context.expressionResolver)
let keyboardType = resolveKeyboardType(context.expressionResolver)
let maxVisibleLines = resolveMaxVisibleLines(context.expressionResolver)
let selectAllOnFocus = resolveSelectAllOnFocus(context.expressionResolver)
let hintValue = resolveHintText(expressionResolver) ?? ""
let keyboardType = resolveKeyboardType(expressionResolver)
let onFocusActions = (focus?.onFocus ?? []).map {
$0.uiAction(context: context.actionContext)
@@ -60,22 +48,19 @@ extension DivInput: DivBlockModeling {
$0.uiAction(context: context.actionContext)
}
let maskValidator = mask?.makeMaskValidator(context.expressionResolver)
let rawTextValue: Binding<String>? = mask?.makeRawVariable(context)
return TextInputBlock(
widthTrait: makeContentWidthTrait(with: context),
heightTrait: makeContentHeightTrait(with: context),
hint: hintValue.with(typo: hintTypo),
textValue: textValue,
rawTextValue: rawTextValue,
textTypo: textTypo,
hint: hintValue.with(typo: typo.with(color: resolveHintColor(expressionResolver))),
textValue: Binding<String>(context: context, name: textVariable),
rawTextValue: mask?.makeRawVariable(context),
textTypo: typo.with(color: resolveTextColor(expressionResolver)),
multiLineMode: keyboardType == .multiLineText,
inputType: keyboardType.system,
highlightColor: highlightColor,
maxVisibleLines: maxVisibleLines,
selectAllOnFocus: selectAllOnFocus,
maskValidator: maskValidator,
highlightColor: resolveHighlightColor(expressionResolver),
maxVisibleLines: resolveMaxVisibleLines(expressionResolver),
selectAllOnFocus: resolveSelectAllOnFocus(expressionResolver),
maskValidator: mask?.makeMaskValidator(expressionResolver),
path: context.parentPath,
onFocusActions: onFocusActions,
onBlurActions: onBlurActions,
client/ios/DivKit/Extensions/DivSelectExtensions.swift
+13 -11
View File
@@ -19,28 +19,30 @@ extension DivSelect: DivBlockModeling {
}
private func makeBaseBlock(context: DivBlockModelingContext) throws -> Block {
let font = context.fontSpecifiers.font(
family: resolveFontFamily(context.expressionResolver).fontFamily,
weight: resolveFontWeight(context.expressionResolver).fontWeight,
size: resolveFontSizeUnit(context.expressionResolver)
.makeScaledValue(resolveFontSize(context.expressionResolver))
let expressionResolver = context.expressionResolver
let font = context.fontProvider.font(
family: resolveFontFamily(expressionResolver) ?? "",
weight: resolveFontWeight(expressionResolver),
size: resolveFontSizeUnit(expressionResolver)
.makeScaledValue(resolveFontSize(expressionResolver))
)
var typo = Typo(font: font).allowHeightOverrun
let kern = CGFloat(resolveLetterSpacing(context.expressionResolver))
let kern = CGFloat(resolveLetterSpacing(expressionResolver))
if !kern.isApproximatelyEqualTo(0) {
typo = typo.kerned(kern)
}
if let lineHeight = resolveLineHeight(context.expressionResolver) {
if let lineHeight = resolveLineHeight(expressionResolver) {
typo = typo.with(height: CGFloat(lineHeight))
}
let resolvedHintColor: Color = resolveHintColor(context.expressionResolver)
let resolvedHintColor: Color = resolveHintColor(expressionResolver)
let hintTypo = typo.with(color: resolvedHintColor)
let hintValue = resolveHintText(context.expressionResolver) ?? ""
let hintValue = resolveHintText(expressionResolver) ?? ""
let resolvedColor: Color = resolveTextColor(context.expressionResolver)
let resolvedColor: Color = resolveTextColor(expressionResolver)
let textTypo = typo.with(color: resolvedColor)
let textValue = Binding<String>(context: context, name: valueVariable)
@@ -59,7 +61,7 @@ extension DivSelect: DivBlockModeling {
textValue: textValue,
rawTextValue: nil,
textTypo: textTypo,
inputType: makeInputType(context.expressionResolver),
inputType: makeInputType(expressionResolver),
path: context.parentPath,
onFocusActions: onFocusActions,
onBlurActions: onBlurActions,
client/ios/DivKit/Extensions/DivSliderExtensions.swift
+7 -6
View File
@@ -146,14 +146,15 @@ extension DivSlider.TextStyle {
context: DivBlockModelingContext,
value: Int
) -> Block {
let expressionResolver = context.expressionResolver
let typo = Typo(
size: FontSize(
rawValue: resolveFontSize(context.expressionResolver)
.flatMap(CGFloat.init) ?? 16
),
weight: resolveFontWeight(context.expressionResolver).fontWeight
font: context.fontProvider.font(
weight: resolveFontWeight(expressionResolver),
size: resolveFontSize(expressionResolver).map(CGFloat.init) ?? 16
)
)
.with(color: resolveTextColor(context.expressionResolver))
.with(color: resolveTextColor(expressionResolver))
.with(alignment: .center)
return TextBlock(
client/ios/DivKit/Extensions/DivTabsExtensions.swift
+14 -14
View File
@@ -39,7 +39,7 @@ extension DivTabs: DivBlockModeling {
let listModel = TabListViewModel(
tabTitles: tabs.map { $0.title },
titleStyle: tabTitleStyle.makeTitleStyle(
fontSpecifiers: context.fontSpecifiers,
fontProvider: context.fontProvider,
expressionResolver: context.expressionResolver
),
listPaddings: titlePaddings.makeEdgeInsets(with: context.expressionResolver)
@@ -104,12 +104,12 @@ typealias Tab = (title: UILink, page: TabPageViewModel)
extension DivTabs.TabTitleStyle {
private func makeTypo(
fontSpecifiers: FontSpecifiers,
fontWeight: FontWeight,
with expressionResolver: ExpressionResolver
fontProvider: DivFontProvider,
fontWeight: DivFontWeight,
expressionResolver: ExpressionResolver
) -> Typo {
let font = fontSpecifiers.font(
family: resolveFontFamily(expressionResolver).fontFamily,
let font = fontProvider.font(
family: resolveFontFamily(expressionResolver) ?? "",
weight: fontWeight,
size: resolveFontSizeUnit(expressionResolver)
.makeScaledValue(resolveFontSize(expressionResolver))
@@ -121,20 +121,20 @@ extension DivTabs.TabTitleStyle {
}
fileprivate func makeTitleStyle(
fontSpecifiers: FontSpecifiers,
fontProvider: DivFontProvider,
expressionResolver: ExpressionResolver
) -> LayoutKit.TabTitleStyle {
let defaultTypo = resolveFontWeight(expressionResolver).fontWeight
let defaultFontWeight = resolveFontWeight(expressionResolver)
return LayoutKit.TabTitleStyle(
typo: makeTypo(
fontSpecifiers: fontSpecifiers,
fontWeight: resolveActiveFontWeight(expressionResolver)?.fontWeight ?? defaultTypo,
with: expressionResolver
fontProvider: fontProvider,
fontWeight: resolveActiveFontWeight(expressionResolver) ?? defaultFontWeight,
expressionResolver: expressionResolver
),
inactiveTypo: makeTypo(
fontSpecifiers: fontSpecifiers,
fontWeight: resolveInactiveFontWeight(expressionResolver)?.fontWeight ?? defaultTypo,
with: expressionResolver
fontProvider: fontProvider,
fontWeight: resolveInactiveFontWeight(expressionResolver) ?? defaultFontWeight,
expressionResolver: expressionResolver
),
paddings: paddings.makeEdgeInsets(with: expressionResolver),
cornerRadius: makeCornerRadii(with: expressionResolver),
client/ios/DivKit/Extensions/DivTextExtensions.swift
+39 -35
View File
@@ -21,46 +21,48 @@ extension DivText: DivBlockModeling {
}
private func makeBaseBlock(context: DivBlockModelingContext) throws -> Block {
let font = context.fontSpecifiers.font(
family: resolveFontFamily(context.expressionResolver).fontFamily,
weight: resolveFontWeight(context.expressionResolver).fontWeight,
size: resolveFontSizeUnit(context.expressionResolver)
.makeScaledValue(resolveFontSize(context.expressionResolver))
let expressionResolver = context.expressionResolver
let font = context.fontProvider.font(
family: resolveFontFamily(expressionResolver) ?? "",
weight: resolveFontWeight(expressionResolver),
size: resolveFontSizeUnit(expressionResolver)
.makeScaledValue(resolveFontSize(expressionResolver))
)
var typo = Typo(font: font).allowHeightOverrun
let alignment = resolveTextAlignmentHorizontal(context.expressionResolver).system
let alignment = resolveTextAlignmentHorizontal(expressionResolver).system
if alignment != .left {
typo = typo.with(alignment: alignment)
}
let kern = CGFloat(resolveLetterSpacing(context.expressionResolver))
let kern = CGFloat(resolveLetterSpacing(expressionResolver))
if !kern.isApproximatelyEqualTo(0) {
typo = typo.kerned(kern)
}
let resolvedColor: Color = resolveTextColor(context.expressionResolver)
let resolvedColor: Color = resolveTextColor(expressionResolver)
if resolvedColor != .black {
typo = typo.with(color: resolvedColor)
}
if let lineHeight = resolveLineHeight(context.expressionResolver) {
if let lineHeight = resolveLineHeight(expressionResolver) {
typo = typo.with(height: CGFloat(lineHeight))
}
switch resolveStrike(context.expressionResolver) {
switch resolveStrike(expressionResolver) {
case .none: break
case .single: typo = typo.struckThrough(.single)
}
switch resolveUnderline(context.expressionResolver) {
switch resolveUnderline(expressionResolver) {
case .none: break
case .single: typo = typo.underlined(.single)
}
let attributedString = makeAttributedString(
text: resolveText(context.expressionResolver) ?? ("" as CFString),
text: resolveText(expressionResolver) ?? ("" as CFString),
typo: typo,
ranges: ranges,
actions: nil,
@@ -75,7 +77,7 @@ extension DivText: DivBlockModeling {
let truncationToken = ellipsis.map {
makeAttributedString(
text: ($0.resolveText(context.expressionResolver) ?? "") as CFString,
text: ($0.resolveText(expressionResolver) ?? "") as CFString,
typo: typo,
ranges: $0.ranges,
actions: $0.makeActions(context: context.actionContext),
@@ -92,15 +94,15 @@ extension DivText: DivBlockModeling {
widthTrait: makeContentWidthTrait(with: context),
heightTrait: makeContentHeightTrait(with: context),
text: attributedString,
textGradient: makeGradient(context.expressionResolver),
textGradient: makeGradient(expressionResolver),
verticalAlignment:
resolveTextAlignmentVertical(context.expressionResolver).alignment,
maxIntrinsicNumberOfLines: resolveMaxLines(context.expressionResolver) ?? .max,
minNumberOfHiddenLines: resolveMinHiddenLines(context.expressionResolver) ?? 0,
resolveTextAlignmentVertical(expressionResolver).alignment,
maxIntrinsicNumberOfLines: resolveMaxLines(expressionResolver) ?? .max,
minNumberOfHiddenLines: resolveMinHiddenLines(expressionResolver) ?? 0,
images: images,
truncationToken: truncationToken,
truncationImages: truncationImages,
canSelect: resolveSelectable(context.expressionResolver)
canSelect: resolveSelectable(expressionResolver)
)
}
@@ -147,39 +149,41 @@ extension DivText: DivBlockModeling {
to string: CFMutableAttributedString,
context: DivBlockModelingContext
) {
let start = range.resolveStart(context.expressionResolver) ?? 0
let end = range.resolveEnd(context.expressionResolver) ?? 0
let expressionResolver = context.expressionResolver
let start = range.resolveStart(expressionResolver) ?? 0
let end = range.resolveEnd(expressionResolver) ?? 0
guard end > start && start < CFAttributedStringGetLength(string) else {
return
}
let fontTypo: Typo?
if range.fontSize != nil || range.fontWeight != nil {
let font = context.fontSpecifiers.font(
family: range.resolveFontFamily(context.expressionResolver)?.fontFamily
?? resolveFontFamily(context.expressionResolver).fontFamily,
let font = context.fontProvider.font(
family: range.resolveFontFamily(expressionResolver)
?? resolveFontFamily(expressionResolver) ?? "",
weight: (
range.resolveFontWeight(context.expressionResolver)
?? resolveFontWeight(context.expressionResolver)
).fontWeight,
range.resolveFontWeight(expressionResolver)
?? resolveFontWeight(expressionResolver)
),
size: CGFloat(
range.resolveFontSize(context.expressionResolver)
?? resolveFontSize(context.expressionResolver)
range.resolveFontSize(expressionResolver)
?? resolveFontSize(expressionResolver)
)
)
fontTypo = Typo(font: font)
} else {
fontTypo = nil
}
let colorTypo = range.resolveTextColor(context.expressionResolver)
let colorTypo = range.resolveTextColor(expressionResolver)
.map { Typo(color: $0) }
let heightTypo = range.resolveLineHeight(context.expressionResolver)
let heightTypo = range.resolveLineHeight(expressionResolver)
.map { Typo(height: CGFloat($0)) }
let spacingTypo = range.resolveLetterSpacing(context.expressionResolver)
let spacingTypo = range.resolveLetterSpacing(expressionResolver)
.map { Typo(kern: CGFloat($0)) }
let strikethroughTypo = range.resolveStrike(context.expressionResolver)
let strikethroughTypo = range.resolveStrike(expressionResolver)
.map { Typo(strikethrough: $0.underlineStyle) }
let underlineTypo = range.resolveUnderline(context.expressionResolver)
let underlineTypo = range.resolveUnderline(expressionResolver)
.map { Typo(underline: $0.underlineStyle) }
let typos = [fontTypo, colorTypo, heightTypo, spacingTypo, strikethroughTypo, underlineTypo]
.compactMap { $0 }
@@ -193,10 +197,10 @@ extension DivText: DivBlockModeling {
typos.forEach { $0.apply(to: string, at: cfRange) }
string.apply(actions, at: cfRange)
range.makeBackground(range: cfRange, resolver: context.expressionResolver)?
range.makeBackground(range: cfRange, resolver: expressionResolver)?
.apply(to: string, at: cfRange)
range.makeBorder(range: cfRange, resolver: context.expressionResolver)?
range.makeBorder(range: cfRange, resolver: expressionResolver)?
.apply(to: string, at: cfRange)
}
client/ios/DivKit/generated_sources/DivFontFamily.swift
-11
View File
@@ -1,11 +0,0 @@
// Generated code. Do not modify.
import CommonCorePublic
import Foundation
import Serialization
@frozen
public enum DivFontFamily: String, CaseIterable {
case text = "text"
case display = "display"
}
client/ios/DivKit/generated_sources/DivInput.swift
+8 -8
View File
@@ -40,7 +40,7 @@ public final class DivInput: DivBase {
public let disappearActions: [DivDisappearAction]? // at least 1 elements
public let extensions: [DivExtension]? // at least 1 elements
public let focus: DivFocus?
public let fontFamily: Expression<DivFontFamily> // default value: text
public let fontFamily: Expression<String>? // at least 1 char
public let fontSize: Expression<Int> // constraint: number >= 0; default value: 12
public let fontSizeUnit: Expression<DivSizeUnit> // default value: sp
public let fontWeight: Expression<DivFontWeight> // default value: regular
@@ -92,8 +92,8 @@ public final class DivInput: DivBase {
resolver.resolveNumericValue(expression: columnSpan)
}
public func resolveFontFamily(_ resolver: ExpressionResolver) -> DivFontFamily {
resolver.resolveStringBasedValue(expression: fontFamily, initializer: DivFontFamily.init(rawValue:)) ?? DivFontFamily.text
public func resolveFontFamily(_ resolver: ExpressionResolver) -> String? {
resolver.resolveStringBasedValue(expression: fontFamily, initializer: { $0 })
}
public func resolveFontSize(_ resolver: ExpressionResolver) -> Int {
@@ -190,8 +190,8 @@ public final class DivInput: DivBase {
static let focusValidator: AnyValueValidator<DivFocus> =
makeNoOpValueValidator()
static let fontFamilyValidator: AnyValueValidator<DivFontFamily> =
makeNoOpValueValidator()
static let fontFamilyValidator: AnyValueValidator<String> =
makeStringValidator(minLength: 1)
static let fontSizeValidator: AnyValueValidator<Int> =
makeValueValidator(valueValidator: { $0 >= 0 })
@@ -303,7 +303,7 @@ public final class DivInput: DivBase {
disappearActions: [DivDisappearAction]? = nil,
extensions: [DivExtension]? = nil,
focus: DivFocus? = nil,
fontFamily: Expression<DivFontFamily>? = nil,
fontFamily: Expression<String>? = nil,
fontSize: Expression<Int>? = nil,
fontSizeUnit: Expression<DivSizeUnit>? = nil,
fontWeight: Expression<DivFontWeight>? = nil,
@@ -349,7 +349,7 @@ public final class DivInput: DivBase {
self.disappearActions = disappearActions
self.extensions = extensions
self.focus = focus
self.fontFamily = fontFamily ?? .value(.text)
self.fontFamily = fontFamily
self.fontSize = fontSize ?? .value(12)
self.fontSizeUnit = fontSizeUnit ?? .value(.sp)
self.fontWeight = fontWeight ?? .value(.regular)
@@ -514,7 +514,7 @@ extension DivInput: Serializable {
result["disappear_actions"] = disappearActions?.map { $0.toDictionary() }
result["extensions"] = extensions?.map { $0.toDictionary() }
result["focus"] = focus?.toDictionary()
result["font_family"] = fontFamily.toValidSerializationValue()
result["font_family"] = fontFamily?.toValidSerializationValue()
result["font_size"] = fontSize.toValidSerializationValue()
result["font_size_unit"] = fontSizeUnit.toValidSerializationValue()
result["font_weight"] = fontWeight.toValidSerializationValue()
client/ios/DivKit/generated_sources/DivInputTemplate.swift
+3 -3
View File
@@ -97,7 +97,7 @@ public final class DivInputTemplate: TemplateValue {
public let disappearActions: Field<[DivDisappearActionTemplate]>? // at least 1 elements
public let extensions: Field<[DivExtensionTemplate]>? // at least 1 elements
public let focus: Field<DivFocusTemplate>?
public let fontFamily: Field<Expression<DivFontFamily>>? // default value: text
public let fontFamily: Field<Expression<String>>? // at least 1 char
public let fontSize: Field<Expression<Int>>? // constraint: number >= 0; default value: 12
public let fontSizeUnit: Field<Expression<DivSizeUnit>>? // default value: sp
public let fontWeight: Field<Expression<DivFontWeight>>? // default value: regular
@@ -203,7 +203,7 @@ public final class DivInputTemplate: TemplateValue {
disappearActions: Field<[DivDisappearActionTemplate]>? = nil,
extensions: Field<[DivExtensionTemplate]>? = nil,
focus: Field<DivFocusTemplate>? = nil,
fontFamily: Field<Expression<DivFontFamily>>? = nil,
fontFamily: Field<Expression<String>>? = nil,
fontSize: Field<Expression<Int>>? = nil,
fontSizeUnit: Field<Expression<DivSizeUnit>>? = nil,
fontWeight: Field<Expression<DivFontWeight>>? = nil,
@@ -452,7 +452,7 @@ public final class DivInputTemplate: TemplateValue {
var disappearActionsValue: DeserializationResult<[DivDisappearAction]> = .noValue
var extensionsValue: DeserializationResult<[DivExtension]> = .noValue
var focusValue: DeserializationResult<DivFocus> = .noValue
var fontFamilyValue: DeserializationResult<Expression<DivFontFamily>> = parent?.fontFamily?.value() ?? .noValue
var fontFamilyValue: DeserializationResult<Expression<String>> = parent?.fontFamily?.value() ?? .noValue
var fontSizeValue: DeserializationResult<Expression<Int>> = parent?.fontSize?.value() ?? .noValue
var fontSizeUnitValue: DeserializationResult<Expression<DivSizeUnit>> = parent?.fontSizeUnit?.value() ?? .noValue
var fontWeightValue: DeserializationResult<Expression<DivFontWeight>> = parent?.fontWeight?.value() ?? .noValue
client/ios/DivKit/generated_sources/DivSelect.swift
+8 -8
View File
@@ -40,7 +40,7 @@ public final class DivSelect: DivBase {
public let disappearActions: [DivDisappearAction]? // at least 1 elements
public let extensions: [DivExtension]? // at least 1 elements
public let focus: DivFocus?
public let fontFamily: Expression<DivFontFamily> // default value: text
public let fontFamily: Expression<String>? // at least 1 char
public let fontSize: Expression<Int> // constraint: number >= 0; default value: 12
public let fontSizeUnit: Expression<DivSizeUnit> // default value: sp
public let fontWeight: Expression<DivFontWeight> // default value: regular
@@ -84,8 +84,8 @@ public final class DivSelect: DivBase {
resolver.resolveNumericValue(expression: columnSpan)
}
public func resolveFontFamily(_ resolver: ExpressionResolver) -> DivFontFamily {
resolver.resolveStringBasedValue(expression: fontFamily, initializer: DivFontFamily.init(rawValue:)) ?? DivFontFamily.text
public func resolveFontFamily(_ resolver: ExpressionResolver) -> String? {
resolver.resolveStringBasedValue(expression: fontFamily, initializer: { $0 })
}
public func resolveFontSize(_ resolver: ExpressionResolver) -> Int {
@@ -158,8 +158,8 @@ public final class DivSelect: DivBase {
static let focusValidator: AnyValueValidator<DivFocus> =
makeNoOpValueValidator()
static let fontFamilyValidator: AnyValueValidator<DivFontFamily> =
makeNoOpValueValidator()
static let fontFamilyValidator: AnyValueValidator<String> =
makeStringValidator(minLength: 1)
static let fontSizeValidator: AnyValueValidator<Int> =
makeValueValidator(valueValidator: { $0 >= 0 })
@@ -247,7 +247,7 @@ public final class DivSelect: DivBase {
disappearActions: [DivDisappearAction]? = nil,
extensions: [DivExtension]? = nil,
focus: DivFocus? = nil,
fontFamily: Expression<DivFontFamily>? = nil,
fontFamily: Expression<String>? = nil,
fontSize: Expression<Int>? = nil,
fontSizeUnit: Expression<DivSizeUnit>? = nil,
fontWeight: Expression<DivFontWeight>? = nil,
@@ -285,7 +285,7 @@ public final class DivSelect: DivBase {
self.disappearActions = disappearActions
self.extensions = extensions
self.focus = focus
self.fontFamily = fontFamily ?? .value(.text)
self.fontFamily = fontFamily
self.fontSize = fontSize ?? .value(12)
self.fontSizeUnit = fontSizeUnit ?? .value(.sp)
self.fontWeight = fontWeight ?? .value(.regular)
@@ -426,7 +426,7 @@ extension DivSelect: Serializable {
result["disappear_actions"] = disappearActions?.map { $0.toDictionary() }
result["extensions"] = extensions?.map { $0.toDictionary() }
result["focus"] = focus?.toDictionary()
result["font_family"] = fontFamily.toValidSerializationValue()
result["font_family"] = fontFamily?.toValidSerializationValue()
result["font_size"] = fontSize.toValidSerializationValue()
result["font_size_unit"] = fontSizeUnit.toValidSerializationValue()
result["font_weight"] = fontWeight.toValidSerializationValue()
client/ios/DivKit/generated_sources/DivSelectTemplate.swift
+3 -3
View File
@@ -109,7 +109,7 @@ public final class DivSelectTemplate: TemplateValue {
public let disappearActions: Field<[DivDisappearActionTemplate]>? // at least 1 elements
public let extensions: Field<[DivExtensionTemplate]>? // at least 1 elements
public let focus: Field<DivFocusTemplate>?
public let fontFamily: Field<Expression<DivFontFamily>>? // default value: text
public let fontFamily: Field<Expression<String>>? // at least 1 char
public let fontSize: Field<Expression<Int>>? // constraint: number >= 0; default value: 12
public let fontSizeUnit: Field<Expression<DivSizeUnit>>? // default value: sp
public let fontWeight: Field<Expression<DivFontWeight>>? // default value: regular
@@ -199,7 +199,7 @@ public final class DivSelectTemplate: TemplateValue {
disappearActions: Field<[DivDisappearActionTemplate]>? = nil,
extensions: Field<[DivExtensionTemplate]>? = nil,
focus: Field<DivFocusTemplate>? = nil,
fontFamily: Field<Expression<DivFontFamily>>? = nil,
fontFamily: Field<Expression<String>>? = nil,
fontSize: Field<Expression<Int>>? = nil,
fontSizeUnit: Field<Expression<DivSizeUnit>>? = nil,
fontWeight: Field<Expression<DivFontWeight>>? = nil,
@@ -412,7 +412,7 @@ public final class DivSelectTemplate: TemplateValue {
var disappearActionsValue: DeserializationResult<[DivDisappearAction]> = .noValue
var extensionsValue: DeserializationResult<[DivExtension]> = .noValue
var focusValue: DeserializationResult<DivFocus> = .noValue
var fontFamilyValue: DeserializationResult<Expression<DivFontFamily>> = parent?.fontFamily?.value() ?? .noValue
var fontFamilyValue: DeserializationResult<Expression<String>> = parent?.fontFamily?.value() ?? .noValue
var fontSizeValue: DeserializationResult<Expression<Int>> = parent?.fontSize?.value() ?? .noValue
var fontSizeUnitValue: DeserializationResult<Expression<DivSizeUnit>> = parent?.fontSizeUnit?.value() ?? .noValue
var fontWeightValue: DeserializationResult<Expression<DivFontWeight>> = parent?.fontWeight?.value() ?? .noValue
client/ios/DivKit/generated_sources/DivTabs.swift
+8 -8
View File
@@ -46,7 +46,7 @@ public final class DivTabs: DivBase {
public let animationType: Expression<AnimationType> // default value: slide
public let cornerRadius: Expression<Int>? // constraint: number >= 0
public let cornersRadius: DivCornersRadius?
public let fontFamily: Expression<DivFontFamily> // default value: text
public let fontFamily: Expression<String>? // at least 1 char
public let fontSize: Expression<Int> // constraint: number >= 0; default value: 12
public let fontSizeUnit: Expression<DivSizeUnit> // default value: sp
public let fontWeight: Expression<DivFontWeight> // default value: regular
@@ -82,8 +82,8 @@ public final class DivTabs: DivBase {
resolver.resolveNumericValue(expression: cornerRadius)
}
public func resolveFontFamily(_ resolver: ExpressionResolver) -> DivFontFamily {
resolver.resolveStringBasedValue(expression: fontFamily, initializer: DivFontFamily.init(rawValue:)) ?? DivFontFamily.text
public func resolveFontFamily(_ resolver: ExpressionResolver) -> String? {
resolver.resolveStringBasedValue(expression: fontFamily, initializer: { $0 })
}
public func resolveFontSize(_ resolver: ExpressionResolver) -> Int {
@@ -143,8 +143,8 @@ public final class DivTabs: DivBase {
static let cornersRadiusValidator: AnyValueValidator<DivCornersRadius> =
makeNoOpValueValidator()
static let fontFamilyValidator: AnyValueValidator<DivFontFamily> =
makeNoOpValueValidator()
static let fontFamilyValidator: AnyValueValidator<String> =
makeStringValidator(minLength: 1)
static let fontSizeValidator: AnyValueValidator<Int> =
makeValueValidator(valueValidator: { $0 >= 0 })
@@ -181,7 +181,7 @@ public final class DivTabs: DivBase {
animationType: Expression<AnimationType>? = nil,
cornerRadius: Expression<Int>? = nil,
cornersRadius: DivCornersRadius? = nil,
fontFamily: Expression<DivFontFamily>? = nil,
fontFamily: Expression<String>? = nil,
fontSize: Expression<Int>? = nil,
fontSizeUnit: Expression<DivSizeUnit>? = nil,
fontWeight: Expression<DivFontWeight>? = nil,
@@ -200,7 +200,7 @@ public final class DivTabs: DivBase {
self.animationType = animationType ?? .value(.slide)
self.cornerRadius = cornerRadius
self.cornersRadius = cornersRadius
self.fontFamily = fontFamily ?? .value(.text)
self.fontFamily = fontFamily
self.fontSize = fontSize ?? .value(12)
self.fontSizeUnit = fontSizeUnit ?? .value(.sp)
self.fontWeight = fontWeight ?? .value(.regular)
@@ -706,7 +706,7 @@ extension DivTabs.TabTitleStyle: Serializable {
result["animation_type"] = animationType.toValidSerializationValue()
result["corner_radius"] = cornerRadius?.toValidSerializationValue()
result["corners_radius"] = cornersRadius?.toDictionary()
result["font_family"] = fontFamily.toValidSerializationValue()
result["font_family"] = fontFamily?.toValidSerializationValue()
result["font_size"] = fontSize.toValidSerializationValue()
result["font_size_unit"] = fontSizeUnit.toValidSerializationValue()
result["font_weight"] = fontWeight.toValidSerializationValue()
client/ios/DivKit/generated_sources/DivTabsTemplate.swift
+3 -3
View File
@@ -139,7 +139,7 @@ public final class DivTabsTemplate: TemplateValue {
public let animationType: Field<Expression<AnimationType>>? // default value: slide
public let cornerRadius: Field<Expression<Int>>? // constraint: number >= 0
public let cornersRadius: Field<DivCornersRadiusTemplate>?
public let fontFamily: Field<Expression<DivFontFamily>>? // default value: text
public let fontFamily: Field<Expression<String>>? // at least 1 char
public let fontSize: Field<Expression<Int>>? // constraint: number >= 0; default value: 12
public let fontSizeUnit: Field<Expression<DivSizeUnit>>? // default value: sp
public let fontWeight: Field<Expression<DivFontWeight>>? // default value: regular
@@ -182,7 +182,7 @@ public final class DivTabsTemplate: TemplateValue {
animationType: Field<Expression<AnimationType>>? = nil,
cornerRadius: Field<Expression<Int>>? = nil,
cornersRadius: Field<DivCornersRadiusTemplate>? = nil,
fontFamily: Field<Expression<DivFontFamily>>? = nil,
fontFamily: Field<Expression<String>>? = nil,
fontSize: Field<Expression<Int>>? = nil,
fontSizeUnit: Field<Expression<DivSizeUnit>>? = nil,
fontWeight: Field<Expression<DivFontWeight>>? = nil,
@@ -287,7 +287,7 @@ public final class DivTabsTemplate: TemplateValue {
var animationTypeValue: DeserializationResult<Expression<DivTabs.TabTitleStyle.AnimationType>> = parent?.animationType?.value() ?? .noValue
var cornerRadiusValue: DeserializationResult<Expression<Int>> = parent?.cornerRadius?.value() ?? .noValue
var cornersRadiusValue: DeserializationResult<DivCornersRadius> = .noValue
var fontFamilyValue: DeserializationResult<Expression<DivFontFamily>> = parent?.fontFamily?.value() ?? .noValue
var fontFamilyValue: DeserializationResult<Expression<String>> = parent?.fontFamily?.value() ?? .noValue
var fontSizeValue: DeserializationResult<Expression<Int>> = parent?.fontSize?.value() ?? .noValue
var fontSizeUnitValue: DeserializationResult<Expression<DivSizeUnit>> = parent?.fontSizeUnit?.value() ?? .noValue
var fontWeightValue: DeserializationResult<Expression<DivFontWeight>> = parent?.fontWeight?.value() ?? .noValue
client/ios/DivKit/generated_sources/DivText.swift
+14 -14
View File
@@ -101,7 +101,7 @@ public final class DivText: DivBase {
public let background: DivTextRangeBackground?
public let border: DivTextRangeBorder?
public let end: Expression<Int> // constraint: number > 0
public let fontFamily: Expression<DivFontFamily>?
public let fontFamily: Expression<String>? // at least 1 char
public let fontSize: Expression<Int>? // constraint: number >= 0
public let fontSizeUnit: Expression<DivSizeUnit> // default value: sp
public let fontWeight: Expression<DivFontWeight>?
@@ -117,8 +117,8 @@ public final class DivText: DivBase {
resolver.resolveNumericValue(expression: end)
}
public func resolveFontFamily(_ resolver: ExpressionResolver) -> DivFontFamily? {
resolver.resolveStringBasedValue(expression: fontFamily, initializer: DivFontFamily.init(rawValue:))
public func resolveFontFamily(_ resolver: ExpressionResolver) -> String? {
resolver.resolveStringBasedValue(expression: fontFamily, initializer: { $0 })
}
public func resolveFontSize(_ resolver: ExpressionResolver) -> Int? {
@@ -173,8 +173,8 @@ public final class DivText: DivBase {
static let endValidator: AnyValueValidator<Int> =
makeValueValidator(valueValidator: { $0 > 0 })
static let fontFamilyValidator: AnyValueValidator<DivFontFamily> =
makeNoOpValueValidator()
static let fontFamilyValidator: AnyValueValidator<String> =
makeStringValidator(minLength: 1)
static let fontSizeValidator: AnyValueValidator<Int> =
makeValueValidator(valueValidator: { $0 >= 0 })
@@ -208,7 +208,7 @@ public final class DivText: DivBase {
background: DivTextRangeBackground? = nil,
border: DivTextRangeBorder? = nil,
end: Expression<Int>,
fontFamily: Expression<DivFontFamily>? = nil,
fontFamily: Expression<String>? = nil,
fontSize: Expression<Int>? = nil,
fontSizeUnit: Expression<DivSizeUnit>? = nil,
fontWeight: Expression<DivFontWeight>? = nil,
@@ -256,7 +256,7 @@ public final class DivText: DivBase {
public let extensions: [DivExtension]? // at least 1 elements
public let focus: DivFocus?
public let focusedTextColor: Expression<Color>?
public let fontFamily: Expression<DivFontFamily> // default value: text
public let fontFamily: Expression<String>? // at least 1 char
public let fontSize: Expression<Int> // constraint: number >= 0; default value: 12
public let fontSizeUnit: Expression<DivSizeUnit> // default value: sp
public let fontWeight: Expression<DivFontWeight> // default value: regular
@@ -316,8 +316,8 @@ public final class DivText: DivBase {
resolver.resolveStringBasedValue(expression: focusedTextColor, initializer: Color.color(withHexString:))
}
public func resolveFontFamily(_ resolver: ExpressionResolver) -> DivFontFamily {
resolver.resolveStringBasedValue(expression: fontFamily, initializer: DivFontFamily.init(rawValue:)) ?? DivFontFamily.text
public func resolveFontFamily(_ resolver: ExpressionResolver) -> String? {
resolver.resolveStringBasedValue(expression: fontFamily, initializer: { $0 })
}
public func resolveFontSize(_ resolver: ExpressionResolver) -> Int {
@@ -435,8 +435,8 @@ public final class DivText: DivBase {
static let focusedTextColorValidator: AnyValueValidator<Color> =
makeNoOpValueValidator()
static let fontFamilyValidator: AnyValueValidator<DivFontFamily> =
makeNoOpValueValidator()
static let fontFamilyValidator: AnyValueValidator<String> =
makeStringValidator(minLength: 1)
static let fontSizeValidator: AnyValueValidator<Int> =
makeValueValidator(valueValidator: { $0 >= 0 })
@@ -555,7 +555,7 @@ public final class DivText: DivBase {
extensions: [DivExtension]? = nil,
focus: DivFocus? = nil,
focusedTextColor: Expression<Color>? = nil,
fontFamily: Expression<DivFontFamily>? = nil,
fontFamily: Expression<String>? = nil,
fontSize: Expression<Int>? = nil,
fontSizeUnit: Expression<DivSizeUnit>? = nil,
fontWeight: Expression<DivFontWeight>? = nil,
@@ -608,7 +608,7 @@ public final class DivText: DivBase {
self.extensions = extensions
self.focus = focus
self.focusedTextColor = focusedTextColor
self.fontFamily = fontFamily ?? .value(.text)
self.fontFamily = fontFamily
self.fontSize = fontSize ?? .value(12)
self.fontSizeUnit = fontSizeUnit ?? .value(.sp)
self.fontWeight = fontWeight ?? .value(.regular)
@@ -799,7 +799,7 @@ extension DivText: Serializable {
result["extensions"] = extensions?.map { $0.toDictionary() }
result["focus"] = focus?.toDictionary()
result["focused_text_color"] = focusedTextColor?.toValidSerializationValue()
result["font_family"] = fontFamily.toValidSerializationValue()
result["font_family"] = fontFamily?.toValidSerializationValue()
result["font_size"] = fontSize.toValidSerializationValue()
result["font_size_unit"] = fontSizeUnit.toValidSerializationValue()
result["font_weight"] = fontWeight.toValidSerializationValue()
client/ios/DivKit/generated_sources/DivTextTemplate.swift
+6 -6
View File
@@ -311,7 +311,7 @@ public final class DivTextTemplate: TemplateValue {
public let background: Field<DivTextRangeBackgroundTemplate>?
public let border: Field<DivTextRangeBorderTemplate>?
public let end: Field<Expression<Int>>? // constraint: number > 0
public let fontFamily: Field<Expression<DivFontFamily>>?
public let fontFamily: Field<Expression<String>>? // at least 1 char
public let fontSize: Field<Expression<Int>>? // constraint: number >= 0
public let fontSizeUnit: Field<Expression<DivSizeUnit>>? // default value: sp
public let fontWeight: Field<Expression<DivFontWeight>>?
@@ -352,7 +352,7 @@ public final class DivTextTemplate: TemplateValue {
background: Field<DivTextRangeBackgroundTemplate>? = nil,
border: Field<DivTextRangeBorderTemplate>? = nil,
end: Field<Expression<Int>>? = nil,
fontFamily: Field<Expression<DivFontFamily>>? = nil,
fontFamily: Field<Expression<String>>? = nil,
fontSize: Field<Expression<Int>>? = nil,
fontSizeUnit: Field<Expression<DivSizeUnit>>? = nil,
fontWeight: Field<Expression<DivFontWeight>>? = nil,
@@ -454,7 +454,7 @@ public final class DivTextTemplate: TemplateValue {
var backgroundValue: DeserializationResult<DivTextRangeBackground> = .noValue
var borderValue: DeserializationResult<DivTextRangeBorder> = .noValue
var endValue: DeserializationResult<Expression<Int>> = parent?.end?.value() ?? .noValue
var fontFamilyValue: DeserializationResult<Expression<DivFontFamily>> = parent?.fontFamily?.value() ?? .noValue
var fontFamilyValue: DeserializationResult<Expression<String>> = parent?.fontFamily?.value() ?? .noValue
var fontSizeValue: DeserializationResult<Expression<Int>> = parent?.fontSize?.value() ?? .noValue
var fontSizeUnitValue: DeserializationResult<Expression<DivSizeUnit>> = parent?.fontSizeUnit?.value() ?? .noValue
var fontWeightValue: DeserializationResult<Expression<DivFontWeight>> = parent?.fontWeight?.value() ?? .noValue
@@ -630,7 +630,7 @@ public final class DivTextTemplate: TemplateValue {
public let extensions: Field<[DivExtensionTemplate]>? // at least 1 elements
public let focus: Field<DivFocusTemplate>?
public let focusedTextColor: Field<Expression<Color>>?
public let fontFamily: Field<Expression<DivFontFamily>>? // default value: text
public let fontFamily: Field<Expression<String>>? // at least 1 char
public let fontSize: Field<Expression<Int>>? // constraint: number >= 0; default value: 12
public let fontSizeUnit: Field<Expression<DivSizeUnit>>? // default value: sp
public let fontWeight: Field<Expression<DivFontWeight>>? // default value: regular
@@ -750,7 +750,7 @@ public final class DivTextTemplate: TemplateValue {
extensions: Field<[DivExtensionTemplate]>? = nil,
focus: Field<DivFocusTemplate>? = nil,
focusedTextColor: Field<Expression<Color>>? = nil,
fontFamily: Field<Expression<DivFontFamily>>? = nil,
fontFamily: Field<Expression<String>>? = nil,
fontSize: Field<Expression<Int>>? = nil,
fontSizeUnit: Field<Expression<DivSizeUnit>>? = nil,
fontWeight: Field<Expression<DivFontWeight>>? = nil,
@@ -1034,7 +1034,7 @@ public final class DivTextTemplate: TemplateValue {
var extensionsValue: DeserializationResult<[DivExtension]> = .noValue
var focusValue: DeserializationResult<DivFocus> = .noValue
var focusedTextColorValue: DeserializationResult<Expression<Color>> = parent?.focusedTextColor?.value() ?? .noValue
var fontFamilyValue: DeserializationResult<Expression<DivFontFamily>> = parent?.fontFamily?.value() ?? .noValue
var fontFamilyValue: DeserializationResult<Expression<String>> = parent?.fontFamily?.value() ?? .noValue
var fontSizeValue: DeserializationResult<Expression<Int>> = parent?.fontSize?.value() ?? .noValue
var fontSizeUnitValue: DeserializationResult<Expression<DivSizeUnit>> = parent?.fontSizeUnit?.value() ?? .noValue
var fontWeightValue: DeserializationResult<Expression<DivFontWeight>> = parent?.fontWeight?.value() ?? .noValue
client/ios/DivKitPlayground/AppComponents.swift
+3
View File
@@ -7,6 +7,8 @@ import LayoutKit
import NetworkingPublic
enum AppComponents {
static let fontProvider = YSFontProvider()
static func makeDivKitComponents(
updateCardAction: DivKitComponents.UpdateCardAction? = nil,
urlOpener: @escaping UrlOpener = { _ in }
@@ -29,6 +31,7 @@ enum AppComponents {
ShimmerImagePreviewExtension(),
],
flagsInfo: DivFlagsInfo(),
fontProvider: fontProvider,
patchProvider: DemoPatchProvider(),
trackVisibility: { logId, cardId in
print(
client/ios/DivKitPlayground/DivKit/DivBlockProvider.swift
+4 -5
View File
@@ -1,6 +1,5 @@
import UIKit
import BaseUIPublic
import CommonCorePublic
import DivKit
import DivKitExtensions
@@ -182,7 +181,7 @@ private let noDataBlock = EmptyBlock.zeroSized
private func makeErrorBlock(_ text: String) -> Block {
TextBlock(
widthTrait: .resizable,
text: text.with(typo: Typo(size: 18, weight: .regular))
text: text.withTypo(size: 18)
).addingEdgeGaps(20)
}
@@ -194,13 +193,13 @@ private func makeErrorsBlock(_ errors: [String]) -> Block {
let separator = SeparatorBlock(color: .gray, direction: .horizontal)
let errorsHeader = TextBlock(
widthTrait: .resizable,
text: "Errors: \(errors.count)".with(typo: Typo(size: 18, weight: .bold))
text: "Errors: \(errors.count)".withTypo(size: 18, weight: .bold)
).addingEdgeGaps(10)
let errorBlocks = errors.map {
TextBlock(
widthTrait: .resizable,
text: $0.with(typo: Typo(size: 14, weight: .regular))
text: $0.withTypo(size: 14, weight: .regular)
).addingEdgeGaps(10)
}
return try! ContainerBlock(
@@ -233,7 +232,7 @@ extension Block {
let textBlock = TextBlock(
widthTrait: .resizable,
text: text.with(typo: Typo(size: 18, weight: .regular))
text: text.withTypo(size: 18)
).addingEdgeGaps(20)
let block = try? ContainerBlock(
client/ios/DivKitPlayground/DivKit/PlaygroundDivCustomBlockFactory.swift
+1 -5
View File
@@ -1,7 +1,4 @@
import Foundation
import BasePublic
import BaseUIPublic
import DivKit
import LayoutKit
@@ -21,8 +18,7 @@ struct PlaygroundDivCustomBlockFactory: DivCustomBlockFactory {
} else {
return TextBlock(
widthTrait: .intrinsic,
text: NSAttributedString(string: "DivCustom(custom_type = \(data.name))")
.with(typo: Typo(size: 16, weight: .regular))
text: "DivCustom(custom_type = \(data.name))".withTypo(size: 16, weight: .regular)
)
}
}
client/ios/DivKitPlayground/DivKitPlaygroundApp.swift
-6
View File
@@ -7,12 +7,6 @@ import DivKit
struct DivKitPlaygroundApp: App {
init() {
DivKitLogger.isEnabled = true
let fontProvider = YSFontProvider()
fontSpecifiers = FontSpecifiers(
text: fontProvider,
display: fontProvider
)
}
var body: some Scene {
client/ios/DivKitPlayground/Fonts/YSFontProvider.swift
+5 -6
View File
@@ -1,25 +1,24 @@
import CoreGraphics
import UIKit
import BaseUIPublic
import DivKit
final class YSFontProvider: FontSpecifying {
final class YSFontProvider: DivFontProvider {
static let mediumFontName = "YSText-Medium"
static let regularFontName = "YSText-Regular"
func font(weight: FontWeight, size: CGFloat) -> UIFont {
func font(family _: String, weight: DivFontWeight, size: CGFloat) -> UIFont {
UIFont(name: weight.fontName, size: size)!
}
}
extension FontWeight {
extension DivFontWeight {
fileprivate var fontName: String {
switch self {
case .light:
return "YSText-Light"
case .regular:
return YSFontProvider.regularFontName
case .medium, .semibold:
case .medium:
return YSFontProvider.mediumFontName
case .bold:
return "YSText-Bold"
client/ios/DivKitPlayground/UI/DivView/SimpleDivView.swift
+1 -2
View File
@@ -1,7 +1,6 @@
import SwiftUI
import UIKit
import BaseUIPublic
import CommonCorePublic
import DivKit
import LayoutKit
@@ -139,6 +138,6 @@ private let noDataBlock = EmptyBlock.zeroSized
private func makeErrorBlock(_ text: String) -> Block {
TextBlock(
widthTrait: .resizable,
text: text.with(typo: Typo(size: 18, weight: .regular))
text: text.withTypo(size: 18)
).addingEdgeGaps(20)
}
client/ios/DivKitPlayground/Utils/StringUtils.swift
+14
View File
@@ -0,0 +1,14 @@
import Foundation
import CoreGraphics
import BaseUIPublic
import DivKit
extension String {
func withTypo(size: CGFloat, weight: DivFontWeight = .regular) -> NSAttributedString {
let typo = Typo(
font: AppComponents.fontProvider.font(weight: weight, size: size)
)
return NSAttributedString(string: self).with(typo: typo)
}
}
client/ios/DivKitSnapshotTests/DivKitSnapshotTestCase.swift
+1 -1
View File
@@ -57,7 +57,7 @@ open class DivKitSnapshotTestCase: XCTestCase {
let divKitComponents = DivKitComponents(
extensionHandlers: extensions,
flagsInfo: DivFlagsInfo(),
fontProvider: YSFontProvider(),
imageHolderFactory: imageHolderFactory ?? makeImageHolderFactory(),
updateCardAction: nil,
urlOpener: { _ in }
client/ios/DivKitSnapshotTests/YSFontProvider.swift
+25
View File
@@ -0,0 +1,25 @@
import UIKit
import BaseUIPublic
import DivKit
final class YSFontProvider: DivFontProvider {
func font(family _: String, weight: DivFontWeight, size: CGFloat) -> UIFont {
UIFont(name: weight.fontName, size: size)!
}
}
extension DivFontWeight {
fileprivate var fontName: String {
switch self {
case .light:
return "YSText-Light"
case .regular:
return "YSText-Regular"
case .medium:
return "YSText-Medium"
case .bold:
return "YSText-Bold"
}
}
}
client/ios/LayoutKitSnapshotTests/AnchorBlockTests.swift
+2 -3
View File
@@ -1,11 +1,10 @@
import CoreGraphics
import XCTest
import BaseUIPublic
import CommonCorePublic
import LayoutKit
final class AnchorBlockTests: XCTestCase {
final class AnchorBlockTests: LayoutKitSnapshotTest {
func test_OnlyCenter_Fits() {
perform(.crossResizables(center: 100))
}
@@ -114,7 +113,7 @@ final class AnchorBlockTests: XCTestCase {
).addingDecorations(border: .init(color: .blue))
).addingDecorations(border: .init(color: .red))
LayoutKitSnapshotTest.perform(
perform(
on: makeCenterOverlay(content: anchor, color: .red)
.addingDecorations(border: .init(color: .gray)),
size: size,
client/ios/LayoutKitSnapshotTests/LayoutKitSnapshotTest.swift
+12 -3
View File
@@ -1,10 +1,19 @@
import CoreGraphics
import Foundation
import XCTest
import BaseUIPublic
import LayoutKit
enum LayoutKitSnapshotTest {
static func perform(
class LayoutKitSnapshotTest: XCTestCase {
override func setUp() {
let fontProvider = YSFontProvider()
fontSpecifiers = FontSpecifiers(
text: fontProvider,
display: fontProvider
)
}
func perform(
on renderable: UIViewRenderable,
size: CGSize,
name: String = #function,
client/ios/LayoutKitSnapshotTests/SwitchableContainerSnapshotTest.swift
+2 -4
View File
@@ -1,10 +1,8 @@
import XCTest
import BaseUIPublic
import CommonCorePublic
import LayoutKit
final class SwitchableContainerSnapshotTest: XCTestCase {
final class SwitchableContainerSnapshotTest: LayoutKitSnapshotTest {
func test_LeftSideSelected() {
performTest(selection: .left, mode: mode)
}
@@ -106,7 +104,7 @@ final class SwitchableContainerSnapshotTest: XCTestCase {
path: UIElementPath("R")
)
LayoutKitSnapshotTest.perform(on: block, size: blockViewSize, name: name, mode: mode)
perform(on: block, size: blockViewSize, name: name, mode: mode)
}
}
client/ios/LayoutKitSnapshotTests/TooltipFactorySnapshotTests.swift
+2 -3
View File
@@ -1,10 +1,9 @@
import CoreGraphics
import XCTest
import CommonCorePublic
import LayoutKit
final class TooltipFactorySnapshotTests: XCTestCase {
final class TooltipFactorySnapshotTests: LayoutKitSnapshotTest {
func test_Orientations() {
BlockTooltip.Position.allCases.forEach {
perform(text: "Тултип", position: $0, width: nil)
@@ -30,7 +29,7 @@ final class TooltipFactorySnapshotTests: XCTestCase {
position: position,
width: width
)
LayoutKitSnapshotTest.perform(
perform(
on: block,
size: block.intrinsicSize,
name: "\(name)_\(position)",
client/ios/SnapshotTestsHostApp/FontProvider.swift → client/ios/LayoutKitSnapshotTests/YSFontProvider.swift
+1 -2
View File
@@ -1,9 +1,8 @@
import CoreGraphics
import UIKit
import BaseUIPublic
final class FontProvider: FontSpecifying {
final class YSFontProvider: FontSpecifying {
func font(weight: FontWeight, size: CGFloat) -> UIFont {
UIFont(name: weight.fontName, size: size)!
}
client/ios/SnapshotTestsHostApp/AppDelegate.swift
-5
View File
@@ -1,7 +1,5 @@
import UIKit
import BaseUIPublic
@UIApplicationMain
final class AppDelegate: NSObject, UIApplicationDelegate {
var window: UIWindow? = UIWindow()
@@ -10,9 +8,6 @@ final class AppDelegate: NSObject, UIApplicationDelegate {
_: UIApplication,
didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]?
) -> Bool {
let provider = FontProvider()
fontSpecifiers = FontSpecifiers(text: provider, display: provider)
window?.rootViewController = ViewController(nibName: nil, bundle: nil)
window?.makeKeyAndVisible()