Merge branch 'release-candidate' into stable

Author: andrewoverton

CHANGELOG.md

@@ -1,3 +1,13 @@
+# 2.0.1
+
+This patch release adds Swift Package Manager support.
+
+* [Adding SPM Support](https://github.com/material-foundation/material-text-accessibility-ios/commit/5b185245864e6b58d6b26dfbe5cd4447e4fda2b4) (DomenicBianchi01)
+* [Internal change](https://github.com/material-foundation/material-text-accessibility-ios/commit/191c0f3eb2b38b29d74338c891cf1acecc74bb44) (Andrew Overton)
+* [Internal change](https://github.com/material-foundation/material-text-accessibility-ios/commit/3f21de715f00813ddae1a5f7e9aa7dc8a1ff3ae1) (Andrew Overton)
+* [Internal change](https://github.com/material-foundation/material-text-accessibility-ios/commit/36ddff44400af3d906ba842d3edb6276d4454d60) (Andrew Overton)
+* [Internal change](https://github.com/material-foundation/material-text-accessibility-ios/commit/f5b3d221f3a633c5ddff5309141fee7d9e01a8bb) (Andrew Overton)
+
 # 2.0.0
 
 This major release upgrades the bazel dependencies and workspace. This change is breaking for anyone

MDFTextAccessibility.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name         = "MDFTextAccessibility"
-  spec.version      = "2.0.0"
+  spec.version      = "2.0.1"
   spec.summary      = "MDFTextAccessibility assists in selecting text colors that meet the W3C standards for accessibility."
   spec.homepage     = "https://github.com/google/material-text-accessibility-ios"
   spec.license      = "Apache License, Version 2.0"

Package.swift

@@ -0,0 +1,33 @@
+// swift-tools-version:5.3
+
+// Copyright 2020-present the Material Text Accessibility for iOS authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import PackageDescription
+
+let package = Package(
+    name: "MDFTextAccessibility",
+    platforms: [
+        .iOS("8.0"), .tvOS("9.0")
+    ],
+    products: [
+        .library(name: "MDFTextAccessibility", targets: ["MDFTextAccessibility"])
+    ],
+    targets: [
+        .target(
+            name: "MDFTextAccessibility",
+            path: "src",
+            publicHeadersPath: ".")
+    ]
+)

WORKSPACE

@@ -44,7 +44,7 @@ swift_rules_dependencies()
 git_repository(
     name = "bazel_ios_warnings",
     remote = "https://github.com/material-foundation/bazel_ios_warnings.git",
-    tag = "v2.0.0",
+    tag = "v2.0.1",
 )
 
 http_file(

examples/apps/MDFTextAccessibilitySample/Podfile

@@ -1,4 +1,4 @@
-platform :ios, '9.3'
+platform :ios, '10'
 use_frameworks!
 
 target 'MDFTextAccessibilitySample' do

src/MDFTextAccessibility.m

@@ -16,9 +16,9 @@
 
 #import "MDFTextAccessibility.h"
 
-#import "private/MDFColorCalculations.h"
-#import "private/MDFImageCalculations.h"
-#import "private/NSArray+MDFUtils.h"
+#import "MDFColorCalculations.h"
+#import "MDFImageCalculations.h"
+#import "NSArray+MDFUtils.h"
 
 static const CGFloat kMinContrastRatioNormalText = 4.5f;
 static const CGFloat kMinContrastRatioLargeText = 3.0f;
@@ -48,19 +48,21 @@ + (nullable UIColor *)textColorOnBackgroundImage:(nonnull UIImage *)backgroundIm
     return nil;
   }
 
-  return
-      [self textColorOnBackgroundColor:backgroundColor targetTextAlpha:targetTextAlpha font:font];
+  return [self textColorOnBackgroundColor:backgroundColor
+                          targetTextAlpha:targetTextAlpha
+                                     font:font];
 }
 
 + (nullable UIColor *)textColorOnBackgroundColor:(nonnull UIColor *)backgroundColor
                                  targetTextAlpha:(CGFloat)targetTextAlpha
                                          options:(MDFTextAccessibilityOptions)options {
   NSArray *colors = @[
-    [UIColor colorWithWhite:1 alpha:targetTextAlpha],
-    [UIColor colorWithWhite:0 alpha:targetTextAlpha]
+    [UIColor colorWithWhite:1 alpha:targetTextAlpha], [UIColor colorWithWhite:0
+                                                                        alpha:targetTextAlpha]
   ];
-  UIColor *textColor =
-      [self textColorFromChoices:colors onBackgroundColor:backgroundColor options:options];
+  UIColor *textColor = [self textColorFromChoices:colors
+                                onBackgroundColor:backgroundColor
+                                          options:options];
   return textColor;
 }
 
@@ -107,8 +109,9 @@ + (nullable UIColor *)textColorFromChoices:(nonnull NSArray<UIColor *> *)choices
     }
 
     CGFloat alpha = CGColorGetAlpha(choice.CGColor);
-    CGFloat minAlpha =
-        [self minAlphaOfTextColor:choice onBackgroundColor:backgroundColor options:options];
+    CGFloat minAlpha = [self minAlphaOfTextColor:choice
+                               onBackgroundColor:backgroundColor
+                                         options:options];
     if (minAlpha > 0) {
       if (alpha > minAlpha) {
         NSAssert(NO,

src/module.modulemap

@@ -123,8 +123,7 @@ CGFloat MDFRelativeLuminanceOfRGBComponents(const CGFloat *components) {
   return 0.2126f * linearRGB[0] + 0.7152f * linearRGB[1] + 0.0722f * linearRGB[2];
 }
 
-CGFloat MDFMinAlphaOfColorOnBackgroundColor(UIColor *color,
-                                            UIColor *backgroundColor,
+CGFloat MDFMinAlphaOfColorOnBackgroundColor(UIColor *color, UIColor *backgroundColor,
                                             CGFloat minContrastRatio) {
   CGFloat colorComponents[4];
   CGFloat backgroundColorComponents[4];

src/private/MDFColorCalculations.m

@@ -45,8 +45,10 @@
 
   CGFloat alpha = argb[0] / (CGFloat)255;
   CGFloat scale = alpha > 0 ? 1 / (alpha * 255) : 0;
-  UIColor *color =
-      [UIColor colorWithRed:scale * argb[1] green:scale * argb[2] blue:scale * argb[3] alpha:alpha];
+  UIColor *color = [UIColor colorWithRed:scale * argb[1]
+                                   green:scale * argb[2]
+                                    blue:scale * argb[3]
+                                   alpha:alpha];
   UIGraphicsEndImageContext();
   return color;
 }