[ASTraitCollection] Add missing properties to ASTraitCollection #625
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| // | ||
| // ASContentSizeCategory.h | ||
| // Texture | ||
| // | ||
| // Copyright (c) 2017-present, Pinterest, Inc. 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 | ||
| // | ||
|
|
||
| #import <UIKit/UIKit.h> | ||
| #import <AsyncDisplayKit/ASBaseDefines.h> | ||
|
|
||
| NS_ASSUME_NONNULL_BEGIN | ||
|
|
||
| /** | ||
| * ASContentSizeCategory is a UIContentSizeCategory that can be used in a struct. | ||
| */ | ||
| typedef NS_ENUM(NSInteger, ASContentSizeCategory) { | ||
| ASContentSizeCategoryUnspecified, | ||
| ASContentSizeCategoryExtraSmall, | ||
| ASContentSizeCategorySmall, | ||
| ASContentSizeCategoryMedium, | ||
| ASContentSizeCategoryLarge, | ||
| ASContentSizeCategoryExtraLarge, | ||
| ASContentSizeCategoryExtraExtraLarge, | ||
| ASContentSizeCategoryExtraExtraExtraLarge, | ||
|
|
||
| // Accessibility sizes | ||
| ASContentSizeCategoryAccessibilityMedium, | ||
| ASContentSizeCategoryAccessibilityLarge, | ||
| ASContentSizeCategoryAccessibilityExtraLarge, | ||
| ASContentSizeCategoryAccessibilityExtraExtraLarge, | ||
| ASContentSizeCategoryAccessibilityExtraExtraExtraLarge | ||
| }; | ||
|
|
||
| /** | ||
| * Mapping from UIContentSizeCategory | ||
| */ | ||
| extern ASContentSizeCategory ASContentSizeCategoryFromUIContentSizeCategory(UIContentSizeCategory contentSizeCategory); | ||
|
|
||
| /** | ||
| * Mapping to UIContentSizeCategory | ||
| */ | ||
| extern UIContentSizeCategory UIContentSizeCategoryFromASContentSizeCategory(ASContentSizeCategory contentSizeCategory); | ||
|
|
||
| NS_ASSUME_NONNULL_END | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| // | ||
| // ASContentSizeCategory.m | ||
| // Texture | ||
| // | ||
| // Copyright (c) 2017-present, Pinterest, Inc. 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 | ||
| // | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
|
|
||
| #import <AsyncDisplayKit/ASContentSizeCategory.h> | ||
| #import <AsyncDisplayKit/ASAvailability.h> | ||
|
|
||
| // UIContentSizeCategoryUnspecified is available only in iOS 10.0 and later. | ||
| // This constant is used as a fallback for older iOS versions. | ||
| UIContentSizeCategory const AS_UIContentSizeCategoryUnspecified = @"_UICTContentSizeCategoryUnspecified"; | ||
|
|
||
|
|
||
| /** | ||
| * Defines a dictionary of pairs of corresponding ASContentSizeCategory and UIContentSizeCategory values. | ||
| */ | ||
| ASDISPLAYNODE_INLINE NSDictionary<NSNumber *, UIContentSizeCategory> *_as_contentSizeCategory_correspondingValues() { | ||
| static NSDictionary<NSNumber *, UIContentSizeCategory> *correspondingValues; | ||
|
|
||
| static dispatch_once_t onceToken; | ||
| dispatch_once(&onceToken, ^{ | ||
| correspondingValues = | ||
| @{ | ||
| // We will fallback to ASContentSizeCategoryUnspecified so there is no need to include it in this dictionary. | ||
|
|
||
| [NSNumber numberWithInteger:ASContentSizeCategoryExtraSmall]: UIContentSizeCategoryExtraSmall, | ||
|
There was a problem hiding this comment. Can we use object literals in this case? |
||
| [NSNumber numberWithInteger:ASContentSizeCategorySmall]: UIContentSizeCategorySmall, | ||
| [NSNumber numberWithInteger:ASContentSizeCategoryMedium]: UIContentSizeCategoryMedium, | ||
| [NSNumber numberWithInteger:ASContentSizeCategoryLarge]: UIContentSizeCategoryLarge, | ||
| [NSNumber numberWithInteger:ASContentSizeCategoryExtraLarge]: UIContentSizeCategoryExtraLarge, | ||
| [NSNumber numberWithInteger:ASContentSizeCategoryExtraExtraLarge]: UIContentSizeCategoryExtraExtraLarge, | ||
| [NSNumber numberWithInteger:ASContentSizeCategoryExtraExtraExtraLarge]: UIContentSizeCategoryExtraExtraExtraLarge, | ||
|
|
||
| [NSNumber numberWithInteger:ASContentSizeCategoryAccessibilityMedium]: UIContentSizeCategoryAccessibilityMedium, | ||
| [NSNumber numberWithInteger:ASContentSizeCategoryAccessibilityLarge]: UIContentSizeCategoryAccessibilityLarge, | ||
| [NSNumber numberWithInteger:ASContentSizeCategoryAccessibilityExtraLarge]: UIContentSizeCategoryAccessibilityExtraLarge, | ||
| [NSNumber numberWithInteger:ASContentSizeCategoryAccessibilityExtraExtraLarge]: UIContentSizeCategoryAccessibilityExtraExtraLarge, | ||
| [NSNumber numberWithInteger:ASContentSizeCategoryAccessibilityExtraExtraExtraLarge]: UIContentSizeCategoryAccessibilityExtraExtraExtraLarge, | ||
| }; | ||
| }); | ||
|
|
||
| return correspondingValues; | ||
| } | ||
|
|
||
| ASContentSizeCategory ASContentSizeCategoryFromUIContentSizeCategory(UIContentSizeCategory contentSizeCategory) { | ||
| if (!contentSizeCategory) { | ||
| return ASContentSizeCategoryUnspecified; | ||
| } | ||
|
|
||
| NSNumber *key = [[_as_contentSizeCategory_correspondingValues() allKeysForObject:contentSizeCategory] firstObject]; | ||
| if (key) { | ||
| return key.integerValue; | ||
| } | ||
| else { | ||
| return ASContentSizeCategoryUnspecified; | ||
| } | ||
| } | ||
|
|
||
| UIContentSizeCategory UIContentSizeCategoryFromASContentSizeCategory(ASContentSizeCategory contentSizeCategory) { | ||
| UIContentSizeCategory result = _as_contentSizeCategory_correspondingValues()[[NSNumber numberWithInteger:contentSizeCategory]]; | ||
| if (result) { | ||
| return result; | ||
| } else if (AS_AT_LEAST_IOS10) { | ||
| return UIContentSizeCategoryUnspecified; | ||
| } else { | ||
| return AS_UIContentSizeCategoryUnspecified; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's do something clever, and use
__unsafe_unretained UIContentSizeCategoryas a struct member: