Disable font scaling by default when using SwiftUI View modifier

Author: rwbutler

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.4.0] - 2022-08-16
+## Changed
+- SwiftUI already scales fonts so scaling as part of the typography style View modifier e.g. `.typography(style: .interactive)` resulted in fonts being scaled twice. Therefore the default scaling mode when using this modifier in SwiftUI is disabled however the scaling mode can be specified as a parameter e.g. `.typography(style: .interactive, scalingMode: .fontMetrics)`.
+
 ## [4.3.2] - 2022-03-16
 ## Changed
 - Fixed an issue concerning font colors in SwiftUI.

Example/Pods/Pods.xcodeproj/project.pbxproj

@@ -280,7 +280,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 1310;
+				LastUpgradeCheck = 1340;
 				ORGANIZATIONNAME = CocoaPods;
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
@@ -611,7 +611,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = TypographyKit/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 4.3.2;
+				MARKETING_VERSION = 4.4.0;
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.rwbutler.TypographyKit-Example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -627,7 +627,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = TypographyKit/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 4.3.2;
+				MARKETING_VERSION = 4.4.0;
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.rwbutler.TypographyKit-Example";
 				PRODUCT_NAME = "$(TARGET_NAME)";

Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/TypographyKit.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1310"
+   LastUpgradeVersion = "1340"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Example/TypographyKit.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'TypographyKit'
-  s.version          = '4.3.2'
+  s.version          = '4.4.0'
   s.summary          = 'Consistent & accessible visual styling on iOS with support for Dynamic Type'
   s.swift_version    = '5.0'
   s.description      = <<-DESC

Example/TypographyKit.xcodeproj/xcshareddata/xcschemes/TypographyKit-Example.xcscheme

@@ -52,7 +52,7 @@ public struct Typography {
     private static let monospacedDigitSystemFontName = "MonospacedDigit\(systemFontName)"
     private static let systemFontName = "System"
 
-    public init?(for textStyle: UIFont.TextStyle) {
+    public init?(for textStyle: UIFont.TextStyle, scalingMode: ScalingMode? = nil) {
         guard let typographyStyle = TypographyKit.fontTextStyles[textStyle.rawValue] else {
             return nil
         }
@@ -63,7 +63,7 @@ public struct Typography {
         self.pointSize = typographyStyle.pointSize
         self.letterCase = typographyStyle.letterCase
         self.letterSpacing = typographyStyle.letterSpacing
-        self.scalingMode = typographyStyle.scalingMode
+        self.scalingMode = scalingMode ?? typographyStyle.scalingMode
         self.textColor = typographyStyle.textColor
         self.textStyle = textStyle
     }

TypographyKit.podspec

@@ -16,25 +16,29 @@ private struct TypographyStyle: ViewModifier {
     @Environment(\.sizeCategory) var sizeCategory
 
     var color: Color? {
-        guard let textColor = Typography(for: style)?.textColor else {
+        guard let textColor = Typography(for: style, scalingMode: scalingMode)?.textColor else {
             return nil
         }
         return Color(textColor)
     }
 
     var font: Font? {
-        guard let font = Typography(for: style)?.font() else {
+        guard let font = Typography(for: style, scalingMode: scalingMode)?.font() else {
             return nil
         }
-        return Font.custom(font.fontName, size: font.pointSize)
+        return Font(font as CTFont)
     }
 
-    var style: UIFont.TextStyle
+    let scalingMode: ScalingMode?
+    let style: UIFont.TextStyle
 
     func body(content: Content) -> some View {
         return content
-            .ifLet(font) { $0.font($1) }
-            .ifLet(color) { $0.foregroundColor($1) }
+            .ifLet(font) { content, font in
+                content.font(font) }
+            .ifLet(color) { view, color in
+                view.foregroundColor(color)
+            }
     }
 
 }
@@ -56,8 +60,8 @@ extension View {
 
 @available(iOS 13, macCatalyst 13, tvOS 13, watchOS 6, *)
 public extension View {
-    func typography(style: UIFont.TextStyle) -> some View {
-        return modifier(TypographyStyle(style: style))
+    func typography(style: UIFont.TextStyle, scalingMode: ScalingMode? = .disabled) -> some View {
+        return modifier(TypographyStyle(scalingMode: scalingMode, style: style))
     }
 }