Skip to content

Commit

Permalink
Updated to Swift 4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
pushchris committed Sep 18, 2018
1 parent b9edf25 commit 8a3457a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
8 changes: 6 additions & 2 deletions Hue.xcodeproj/project.pbxproj
Expand Up @@ -384,11 +384,11 @@
};
D52862111C3EAC1D00AD11AD = {
CreatedOnToolsVersion = 7.2;
LastSwiftMigration = 0800;
LastSwiftMigration = 1000;
};
D528621B1C3EAC1D00AD11AD = {
CreatedOnToolsVersion = 7.2;
LastSwiftMigration = 0800;
LastSwiftMigration = 1000;
};
};
};
Expand Down Expand Up @@ -807,6 +807,7 @@
PRODUCT_BUNDLE_IDENTIFIER = no.hyper.Hue;
PRODUCT_NAME = Hue;
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -827,6 +828,7 @@
PRODUCT_NAME = Hue;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand All @@ -837,6 +839,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = no.hyper.HueTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -848,6 +851,7 @@
PRODUCT_BUNDLE_IDENTIFIER = no.hyper.HueTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand Down
6 changes: 3 additions & 3 deletions Source/iOS/UIColor+Hue.swift
Expand Up @@ -95,9 +95,9 @@ public extension UIColor {
let threshold: CGFloat = 0.25
var result = false

if fabs(bg[0] - fg[0]) > threshold || fabs(bg[1] - fg[1]) > threshold || fabs(bg[2] - fg[2]) > threshold {
if fabs(bg[0] - bg[1]) < 0.03 && fabs(bg[0] - bg[2]) < 0.03 {
if fabs(fg[0] - fg[1]) < 0.03 && fabs(fg[0] - fg[2]) < 0.03 {
if abs(bg[0] - fg[0]) > threshold || abs(bg[1] - fg[1]) > threshold || abs(bg[2] - fg[2]) > threshold {
if abs(bg[0] - bg[1]) < 0.03 && abs(bg[0] - bg[2]) < 0.03 {
if abs(fg[0] - fg[1]) < 0.03 && abs(fg[0] - fg[2]) < 0.03 {
result = false
}
}
Expand Down

0 comments on commit 8a3457a

Please sign in to comment.