Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

func apply(styles: [StringConvertible]) #22

Merged
merged 4 commits into from
Jan 10, 2022
Merged

func apply(styles: [StringConvertible]) #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a18fd68
func apply(styles: [StringConvertible])
RomanPodymov Dec 29, 2021
1a51a83
tests
RomanPodymov Dec 29, 2021
fb51b2e
Fix project file
RomanPodymov Jan 6, 2022
09ca0fb
TARGETED_DEVICE_FAMILY
RomanPodymov Jan 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
132 changes: 126 additions & 6 deletions Fashion.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
objects = {

/* Begin PBXBuildFile section */
9ECB95A22787B052002850D8 /* Fashion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D5C629401C3A7FAA007F7B7C /* Fashion.framework */; };
9ECB95A52787B2F6002850D8 /* NSView+StyleableTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9ECB95A42787B2F6002850D8 /* NSView+StyleableTests.swift */; };
9ECB95A62787B347002850D8 /* NSView+Styleable.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C629841C3A893F007F7B7C /* NSView+Styleable.swift */; };
D270E9061E0062C3008E7C5F /* Fashion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D270E8FD1E0062C3008E7C5F /* Fashion.framework */; };
D270E9191E0063A7008E7C5F /* Styleable.swift in Sources */ = {isa = PBXBuildFile; fileRef = D521588C1C95CBFC004EE4BE /* Styleable.swift */; };
D270E91A1E0063A7008E7C5F /* Style.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C629861C3A89A8007F7B7C /* Style.swift */; };
Expand Down Expand Up @@ -51,7 +54,6 @@
D5A516DF1C98127E00B5442D /* UIView+StyleableTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5A516D41C98127E00B5442D /* UIView+StyleableTests.swift */; };
D5B2E8AA1C3A780C00C0327D /* Fashion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D5B2E89F1C3A780C00C0327D /* Fashion.framework */; };
D5C629831C3A892A007F7B7C /* UIView+Styleable.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C629821C3A892A007F7B7C /* UIView+Styleable.swift */; };
D5C629851C3A893F007F7B7C /* NSView+Styleable.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C629841C3A893F007F7B7C /* NSView+Styleable.swift */; };
D5C629871C3A89A8007F7B7C /* Style.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C629861C3A89A8007F7B7C /* Style.swift */; };
D5C629881C3A89A8007F7B7C /* Style.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C629861C3A89A8007F7B7C /* Style.swift */; };
D5CD50E21D9DB8DA0031C666 /* Swizzler.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5CD50E11D9DB8DA0031C666 /* Swizzler.swift */; };
Expand All @@ -61,6 +63,13 @@
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
9ECB959F2787B03F002850D8 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = D5B2E8961C3A780C00C0327D /* Project object */;
proxyType = 1;
remoteGlobalIDString = D5C6293F1C3A7FAA007F7B7C;
remoteInfo = "Fashion-Mac";
};
D270E9071E0062C3008E7C5F /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = D5B2E8961C3A780C00C0327D /* Project object */;
Expand All @@ -78,6 +87,8 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
9ECB959C2787AF64002850D8 /* Fashion-Mac-Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Fashion-Mac-Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
9ECB95A42787B2F6002850D8 /* NSView+StyleableTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSView+StyleableTests.swift"; sourceTree = "<group>"; };
D270E8FD1E0062C3008E7C5F /* Fashion.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Fashion.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D270E9051E0062C3008E7C5F /* Fashion-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Fashion-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
D270E9141E006321008E7C5F /* Info-tvOS.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-tvOS.plist"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -115,6 +126,14 @@
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
9ECB95962787AF64002850D8 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
9ECB95A22787B052002850D8 /* Fashion.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
D270E8F91E0062C3008E7C5F /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -155,6 +174,21 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
9ECB95A12787B052002850D8 /* Frameworks */ = {
isa = PBXGroup;
children = (
);
name = Frameworks;
sourceTree = "<group>";
};
9ECB95A32787B2F6002850D8 /* Mac */ = {
isa = PBXGroup;
children = (
9ECB95A42787B2F6002850D8 /* NSView+StyleableTests.swift */,
);
path = Mac;
sourceTree = "<group>";
};
C79AC60D2559865D003DF3A7 /* Tests */ = {
isa = PBXGroup;
children = (
Expand All @@ -176,8 +210,9 @@
D5A516C71C98127E00B5442D /* FashionTests */ = {
isa = PBXGroup;
children = (
D5A516E01C98129500B5442D /* Supporting Files */,
D5A516CA1C98127E00B5442D /* iOS */,
9ECB95A32787B2F6002850D8 /* Mac */,
D5A516E01C98129500B5442D /* Supporting Files */,
);
path = FashionTests;
sourceTree = "<group>";
Expand Down Expand Up @@ -225,6 +260,7 @@
D5A516C21C98125100B5442D /* Fashion */,
C79AC60D2559865D003DF3A7 /* Tests */,
D5B2E8A01C3A780C00C0327D /* Products */,
9ECB95A12787B052002850D8 /* Frameworks */,
);
sourceTree = "<group>";
};
Expand All @@ -236,6 +272,7 @@
D5C629401C3A7FAA007F7B7C /* Fashion.framework */,
D270E8FD1E0062C3008E7C5F /* Fashion.framework */,
D270E9051E0062C3008E7C5F /* Fashion-tvOSTests.xctest */,
9ECB959C2787AF64002850D8 /* Fashion-Mac-Tests.xctest */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -310,6 +347,24 @@
/* End PBXHeadersBuildPhase section */

/* Begin PBXNativeTarget section */
9ECB95892787AF64002850D8 /* Fashion-Mac-Tests */ = {
isa = PBXNativeTarget;
buildConfigurationList = 9ECB95992787AF64002850D8 /* Build configuration list for PBXNativeTarget "Fashion-Mac-Tests" */;
buildPhases = (
9ECB958C2787AF64002850D8 /* Sources */,
9ECB95962787AF64002850D8 /* Frameworks */,
9ECB95982787AF64002850D8 /* Resources */,
);
buildRules = (
);
dependencies = (
9ECB95A02787B03F002850D8 /* PBXTargetDependency */,
);
name = "Fashion-Mac-Tests";
productName = FashionTests;
productReference = 9ECB959C2787AF64002850D8 /* Fashion-Mac-Tests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
D270E8FC1E0062C3008E7C5F /* Fashion-tvOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = D270E9121E0062C3008E7C5F /* Build configuration list for PBXNativeTarget "Fashion-tvOS" */;
Expand Down Expand Up @@ -450,15 +505,23 @@
projectRoot = "";
targets = (
D5B2E89E1C3A780C00C0327D /* Fashion-iOS */,
D5C6293F1C3A7FAA007F7B7C /* Fashion-Mac */,
D5B2E8A81C3A780C00C0327D /* Fashion-iOS-Tests */,
D5C6293F1C3A7FAA007F7B7C /* Fashion-Mac */,
9ECB95892787AF64002850D8 /* Fashion-Mac-Tests */,
D270E8FC1E0062C3008E7C5F /* Fashion-tvOS */,
D270E9041E0062C3008E7C5F /* Fashion-tvOSTests */,
);
};
/* End PBXProject section */

/* Begin PBXResourcesBuildPhase section */
9ECB95982787AF64002850D8 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
D270E8FB1E0062C3008E7C5F /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -528,6 +591,14 @@
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
9ECB958C2787AF64002850D8 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
9ECB95A52787B2F6002850D8 /* NSView+StyleableTests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
D270E8F81E0062C3008E7C5F /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -601,20 +672,25 @@
buildActionMask = 2147483647;
files = (
D52158711C94A444004EE4BE /* Stylist.swift in Sources */,
D5C629851C3A893F007F7B7C /* NSView+Styleable.swift in Sources */,
D52158751C95B117004EE4BE /* StyleManaging.swift in Sources */,
D5C629881C3A89A8007F7B7C /* Style.swift in Sources */,
D52158781C95B369004EE4BE /* Fashion.swift in Sources */,
D52158691C948CE2004EE4BE /* Stylesheet.swift in Sources */,
D5F2E6A31CC98D5200D180B9 /* StringConvertible.swift in Sources */,
D521588E1C95CBFC004EE4BE /* Styleable.swift in Sources */,
9ECB95A62787B347002850D8 /* NSView+Styleable.swift in Sources */,
D5CD50E31D9DB8DA0031C666 /* Swizzler.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
9ECB95A02787B03F002850D8 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = D5C6293F1C3A7FAA007F7B7C /* Fashion-Mac */;
targetProxy = 9ECB959F2787B03F002850D8 /* PBXContainerItemProxy */;
};
D270E9081E0062C3008E7C5F /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = D270E8FC1E0062C3008E7C5F /* Fashion-tvOS */;
Expand All @@ -628,6 +704,37 @@
/* End PBXTargetDependency section */

/* Begin XCBuildConfiguration section */
9ECB959A2787AF64002850D8 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = "$(SRCROOT)/Tests/FashionTests/Info-Mac.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.vadymmarkov.Fashion-MacTests";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
9ECB959B2787AF64002850D8 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = "$(SRCROOT)/Tests/FashionTests/Info-Mac.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.vadymmarkov.Fashion-MacTests";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 5.0;
};
name = Release;
};
D270E90E1E0062C3008E7C5F /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
Expand Down Expand Up @@ -687,14 +794,15 @@
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_SUSPICIOUS_MOVES = YES;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = "Tests/FashionTests/Info-tvOS.plist";
INFOPLIST_FILE = "$(SRCROOT)/Tests/FashionTests/Info-tvOS.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.vadymmarkov.Fashion-tvOSTests";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 10.0;
};
name = Debug;
Expand All @@ -707,13 +815,14 @@
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_SUSPICIOUS_MOVES = YES;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = "Tests/FashionTests/Info-tvOS.plist";
INFOPLIST_FILE = "$(SRCROOT)/Tests/FashionTests/Info-tvOS.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.vadymmarkov.Fashion-tvOSTests";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 10.0;
};
name = Release;
Expand Down Expand Up @@ -889,6 +998,7 @@
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
Expand All @@ -903,6 +1013,7 @@
PRODUCT_NAME = "Fashion-Tests-iOS";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
};
Expand Down Expand Up @@ -958,6 +1069,15 @@
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
9ECB95992787AF64002850D8 /* Build configuration list for PBXNativeTarget "Fashion-Mac-Tests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
9ECB959A2787AF64002850D8 /* Debug */,
9ECB959B2787AF64002850D8 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
D270E9121E0062C3008E7C5F /* Build configuration list for PBXNativeTarget "Fashion-tvOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
Expand Down
10 changes: 10 additions & 0 deletions Fashion.xcodeproj/xcshareddata/xcschemes/Fashion-Mac.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,16 @@
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9ECB95892787AF64002850D8"
BuildableName = "Fashion-Mac-Tests.xctest"
BlueprintName = "Fashion-Mac-Tests"
ReferencedContainer = "container:Fashion.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
Expand Down
17 changes: 13 additions & 4 deletions Sources/Mac/NSView+Styleable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,28 @@ public extension NSView {
private struct AssociatedKeys {
static var Style = "fashion_StyleAssociatedKey"
}

/**
Applies previously registered styles.

- Parameter styles: Set of style names.
*/
func apply(styles: StringConvertible...) {
func apply(styles: [StringConvertible]) {
self.styles = styles.map { $0.string } .joined(separator: " ")
}

/**
Applies previously registered styles.

- Parameter styles: Set of style names.
*/
func apply(styles: StringConvertible...) {
apply(styles: styles.map { $0 })
}

/**
Applies previously registered styles.

- Parameter styles: Single style or multiple styles separated by whitespace.
*/
@IBInspectable var styles: String? {
Expand All @@ -33,7 +42,7 @@ public extension NSView {
newValue,
objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN_NONATOMIC
)

if let newValue = newValue {
let styles = newValue.components(separatedBy: " ")
Stylist.master.apply(styles, model: self)
Expand Down
14 changes: 12 additions & 2 deletions Sources/iOS/UIView+Styleable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,32 @@ extension UIView {

public convenience init(frame: CGRect = CGRect.zero, styles: [StringConvertible]) {
self.init(frame: frame)
self.styles = styles.map { $0.string } .joined(separator: " ")
apply(styles: styles)
}

public convenience init(frame: CGRect = CGRect.zero, styles: StringConvertible) {
self.init(frame: frame)
apply(styles: styles)
}

/**
Applies previously registered styles.

- Parameter styles: Set of style names.
*/

public func apply(styles: [StringConvertible]) {
self.styles = styles.map { $0.string } .joined(separator: " ")
}

/**
Applies previously registered styles.

- Parameter styles: Set of style names.
*/

public func apply(styles: StringConvertible...) {
self.styles = styles.map { $0.string } .joined(separator: " ")
apply(styles: styles.map { $0 })
}

/**
Expand Down
Loading