Skip to content

Commit f0632cf

Browse files
kishikawakatsumikishikawakatsumi
committed
Merge category methods.
1 parent f9db38f commit f0632cf

28 files changed

Lines changed: 223 additions & 481 deletions

‎Classes/ios/FrameworkSupport/AVFoundation/JSBNSCoder.h‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎Classes/ios/FrameworkSupport/AVFoundation/JSBNSValue.h‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎Classes/ios/FrameworkSupport/CoreImage/JSBCIColor.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#import <Foundation/Foundation.h>
33

44
@import CoreImage;
5+
@import UIKit;
56
@import JavaScriptCore;
67

78
@protocol JSBNSObject;
@@ -26,6 +27,13 @@
2627
- (CGFloat)blue;
2728
- (NSString *)stringRepresentation;
2829

30+
#pragma mark - UIKit
31+
32+
@property (nonatomic, readonly) CGColorRef CGColor;
33+
@property (nonatomic, readonly) CIColor *CIColor;
34+
35+
- (id)initWithColor:(UIColor *)color;
36+
2937
#pragma clang diagnostic pop
3038

3139
@end

‎Classes/ios/FrameworkSupport/CoreImage/JSBCIImage.h‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#import <CoreVideo/CoreVideo.h>
44

55
@import CoreImage;
6+
@import UIKit;
67
@import JavaScriptCore;
78

89
@protocol JSBNSObject;
@@ -55,6 +56,25 @@
5556
- (NSArray *)autoAdjustmentFilters;
5657
- (NSArray *)autoAdjustmentFiltersWithOptions:(NSDictionary *)dict;
5758

59+
#pragma mark - UIKit
60+
61+
@property (nonatomic, readonly) CIImage *CIImage;
62+
@property (nonatomic, readonly) UIEdgeInsets capInsets;
63+
@property (nonatomic, readonly) CGFloat scale;
64+
@property (nonatomic, readonly) UIImageRenderingMode renderingMode;
65+
@property (nonatomic, readonly) NSInteger leftCapWidth;
66+
@property (nonatomic, readonly) CGImageRef CGImage;
67+
@property (nonatomic, readonly) CGSize size;
68+
@property (nonatomic, readonly) NSInteger topCapHeight;
69+
@property (nonatomic, readonly) UIEdgeInsets alignmentRectInsets;
70+
@property (nonatomic, readonly) NSArray *images;
71+
@property (nonatomic, readonly) NSTimeInterval duration;
72+
@property (nonatomic, readonly) UIImageOrientation imageOrientation;
73+
@property (nonatomic, readonly) UIImageResizingMode resizingMode;
74+
75+
- (id)initWithImage:(UIImage *)image;
76+
- (id)initWithImage:(UIImage *)image options:(NSDictionary *)options;
77+
5878
#pragma clang diagnostic pop
5979

6080
@end

‎Classes/ios/FrameworkSupport/Foundation/JSBNSAttributedString.h‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#import <Foundation/NSDictionary.h>
33

44
@import Foundation;
5+
@import UIKit;
56
@import JavaScriptCore;
67

78
@protocol JSBNSObject;
@@ -25,6 +26,28 @@
2526
- (void)enumerateAttributesInRange:(NSRange)enumerationRange options:(NSAttributedStringEnumerationOptions)opts usingBlock:(void (^)(NSDictionary *attrs , NSRange range , BOOL *stop))block;
2627
- (void)enumerateAttribute:(NSString *)attrName inRange:(NSRange)enumerationRange options:(NSAttributedStringEnumerationOptions)opts usingBlock:(void (^)(id value , NSRange range , BOOL *stop))block;
2728

29+
#pragma mark - UIKit
30+
31+
@property (retain) NSFileWrapper *fileWrapper;
32+
@property (retain) NSString *fileType;
33+
@property (retain) NSData *contents;
34+
@property (retain) UIImage *image;
35+
@property CGRect bounds;
36+
37+
+ (NSAttributedString *)attributedStringWithAttachment:(NSTextAttachment *)attachment;
38+
39+
- (id)initWithFileURL:(NSURL *)url options:(NSDictionary *)options documentAttributes:(NSDictionary **)dict error:(NSError **)error;
40+
- (id)initWithData:(NSData *)data options:(NSDictionary *)options documentAttributes:(NSDictionary **)dict error:(NSError **)error;
41+
- (NSData *)dataFromRange:(NSRange)range documentAttributes:(NSDictionary *)dict error:(NSError **)error;
42+
- (NSFileWrapper *)fileWrapperFromRange:(NSRange)range documentAttributes:(NSDictionary *)dict error:(NSError **)error;
43+
- (CGSize)size;
44+
- (void)drawAtPoint:(CGPoint)point;
45+
- (void)drawInRect:(CGRect)rect;
46+
- (void)drawWithRect:(CGRect)rect options:(NSStringDrawingOptions)options attributes:(NSDictionary *)attributes context:(NSStringDrawingContext *)context;
47+
- (CGRect)boundingRectWithSize:(CGSize)size options:(NSStringDrawingOptions)options attributes:(NSDictionary *)attributes context:(NSStringDrawingContext *)context;
48+
- (void)drawWithRect:(CGRect)rect options:(NSStringDrawingOptions)options context:(NSStringDrawingContext *)context;
49+
- (CGRect)boundingRectWithSize:(CGSize)size options:(NSStringDrawingOptions)options context:(NSStringDrawingContext *)context;
50+
2851
#pragma clang diagnostic pop
2952

3053
@end

‎Classes/ios/FrameworkSupport/Foundation/JSBNSBundle.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#import <Foundation/NSObject.h>
22

33
@import Foundation;
4+
@import UIKit;
45
@import JavaScriptCore;
56

67
@protocol JSBNSObject;
@@ -70,6 +71,10 @@
7071
- (NSString *)developmentLocalization;
7172
- (NSArray *)executableArchitectures;
7273

74+
#pragma mark - UIKit
75+
76+
- (NSArray *)loadNibNamed:(NSString *)name owner:(id)owner options:(NSDictionary *)options;
77+
7378
#pragma clang diagnostic pop
7479

7580
@end

‎Classes/ios/FrameworkSupport/Foundation/JSBNSCoder.h‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#import <Foundation/NSObject.h>
22

33
@import Foundation;
4+
@import UIKit;
5+
@import AVFoundation;
46
@import JavaScriptCore;
57

68
@protocol JSBNSObject;
@@ -57,6 +59,30 @@
5759
- (id)decodePropertyListForKey:(NSString *)key;
5860
- (NSSet *)allowedClasses;
5961

62+
#pragma mark - UIKit
63+
64+
- (void)encodeCGPoint:(CGPoint)point forKey:(NSString *)key;
65+
- (void)encodeCGSize:(CGSize)size forKey:(NSString *)key;
66+
- (void)encodeCGRect:(CGRect)rect forKey:(NSString *)key;
67+
- (void)encodeCGAffineTransform:(CGAffineTransform)transform forKey:(NSString *)key;
68+
- (void)encodeUIEdgeInsets:(UIEdgeInsets)insets forKey:(NSString *)key;
69+
- (void)encodeUIOffset:(UIOffset)offset forKey:(NSString *)key;
70+
- (CGPoint)decodeCGPointForKey:(NSString *)key;
71+
- (CGSize)decodeCGSizeForKey:(NSString *)key;
72+
- (CGRect)decodeCGRectForKey:(NSString *)key;
73+
- (CGAffineTransform)decodeCGAffineTransformForKey:(NSString *)key;
74+
- (UIEdgeInsets)decodeUIEdgeInsetsForKey:(NSString *)key;
75+
- (UIOffset)decodeUIOffsetForKey:(NSString *)key;
76+
77+
#pragma mark - AVFoundation
78+
79+
- (void)encodeCMTime:(CMTime)time forKey:(NSString *)key;
80+
- (CMTime)decodeCMTimeForKey:(NSString *)key;
81+
- (void)encodeCMTimeRange:(CMTimeRange)timeRange forKey:(NSString *)key;
82+
- (CMTimeRange)decodeCMTimeRangeForKey:(NSString *)key;
83+
- (void)encodeCMTimeMapping:(CMTimeMapping)timeMapping forKey:(NSString *)key;
84+
- (CMTimeMapping)decodeCMTimeMappingForKey:(NSString *)key;
85+
6086
#pragma clang diagnostic pop
6187

6288
@end

‎Classes/ios/FrameworkSupport/Foundation/JSBNSIndexPath.h‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#import <Foundation/NSObject.h>
22

33
@import Foundation;
4+
@import UIKit;
45
@import JavaScriptCore;
56

67
@protocol JSBNSObject;
@@ -23,6 +24,38 @@
2324
- (void)getIndexes:(NSUInteger *)indexes;
2425
- (NSComparisonResult)compare:(NSIndexPath *)otherObject;
2526

27+
#pragma mark - UIKit
28+
29+
@property (nonatomic, retain) UIColor *separatorColor;
30+
@property (nonatomic) CGFloat sectionHeaderHeight;
31+
@property (nonatomic, readonly) UITableViewStyle style;
32+
@property (nonatomic) CGFloat estimatedSectionFooterHeight;
33+
@property (nonatomic) NSInteger sectionIndexMinimumDisplayRowCount;
34+
@property (nonatomic, assign) id delegate;
35+
@property (nonatomic) BOOL allowsMultipleSelectionDuringEditing;
36+
@property (nonatomic) CGFloat rowHeight;
37+
@property (nonatomic, readwrite, retain) UIView *backgroundView;
38+
@property (nonatomic) UITableViewCellSeparatorStyle separatorStyle;
39+
@property (nonatomic, retain) UIView *tableHeaderView;
40+
@property (nonatomic) BOOL allowsMultipleSelection;
41+
@property (nonatomic) CGFloat sectionFooterHeight;
42+
@property (nonatomic) BOOL allowsSelection;
43+
@property (nonatomic) BOOL allowsSelectionDuringEditing;
44+
@property (nonatomic, retain) UIColor *sectionIndexBackgroundColor;
45+
@property (nonatomic, retain) UIColor *sectionIndexColor;
46+
@property (nonatomic, retain) UIColor *sectionIndexTrackingBackgroundColor;
47+
@property (nonatomic, retain) UIView *tableFooterView;
48+
@property (nonatomic, readonly) NSInteger row;
49+
@property (nonatomic) CGFloat estimatedSectionHeaderHeight;
50+
@property (nonatomic) CGFloat estimatedRowHeight;
51+
@property (nonatomic, getter = isEditing) BOOL editing;
52+
@property (nonatomic) UIEdgeInsets separatorInset;
53+
@property (nonatomic, readonly) NSInteger section;
54+
@property (nonatomic, assign) id dataSource;
55+
56+
+ (NSIndexPath *)indexPathForRow:(NSInteger)row inSection:(NSInteger)section;
57+
+ (NSIndexPath *)indexPathForItem:(NSInteger)item inSection:(NSInteger)section;
58+
2659
#pragma clang diagnostic pop
2760

2861
@end

‎Classes/ios/FrameworkSupport/Foundation/JSBNSMutableAttributedString.h‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#import <Foundation/NSDictionary.h>
33

44
@import Foundation;
5+
@import UIKit;
56
@import JavaScriptCore;
67

78
@protocol JSBNSAttributedString;
@@ -25,6 +26,16 @@
2526
- (void)beginEditing;
2627
- (void)endEditing;
2728

29+
#pragma mark - UIKit
30+
31+
- (void)fixAttributesInRange:(NSRange)range;
32+
- (id)initWithFileURL:(NSURL *)url options:(NSDictionary *)options documentAttributes:(NSDictionary **)dict error:(NSError **)error;
33+
- (id)initWithData:(NSData *)data options:(NSDictionary *)options documentAttributes:(NSDictionary **)dict error:(NSError **)error;
34+
- (NSData *)dataFromRange:(NSRange)range documentAttributes:(NSDictionary *)dict error:(NSError **)error;
35+
- (NSFileWrapper *)fileWrapperFromRange:(NSRange)range documentAttributes:(NSDictionary *)dict error:(NSError **)error;
36+
- (BOOL)readFromFileURL:(NSURL *)url options:(NSDictionary *)opts documentAttributes:(NSDictionary **)dict error:(NSError **)error;
37+
- (BOOL)readFromData:(NSData *)data options:(NSDictionary *)opts documentAttributes:(NSDictionary **)dict error:(NSError **)error;
38+
2839
#pragma clang diagnostic pop
2940

3041
@end

‎Classes/ios/FrameworkSupport/Foundation/JSBNSString.h‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#import <Foundation/NSCharacterSet.h>
44

55
@import Foundation;
6+
@import UIKit;
67
@import JavaScriptCore;
78

89
@protocol JSBNSObject;
@@ -186,6 +187,29 @@
186187
- (id)initWithCString:(const char *)bytes;
187188
- (void)getCharacters:(unichar *)buffer;
188189

190+
#pragma mark - UIKit
191+
192+
- (CGSize)sizeWithFont:(UIFont *)font;
193+
- (CGSize)sizeWithFont:(UIFont *)font forWidth:(CGFloat)width lineBreakMode:(NSLineBreakMode)lineBreakMode;
194+
- (CGSize)drawAtPoint:(CGPoint)point withFont:(UIFont *)font;
195+
- (CGSize)drawAtPoint:(CGPoint)point forWidth:(CGFloat)width withFont:(UIFont *)font lineBreakMode:(NSLineBreakMode)lineBreakMode;
196+
- (CGSize)sizeWithFont:(UIFont *)font constrainedToSize:(CGSize)size;
197+
- (CGSize)sizeWithFont:(UIFont *)font constrainedToSize:(CGSize)size lineBreakMode:(NSLineBreakMode)lineBreakMode;
198+
- (CGSize)drawInRect:(CGRect)rect withFont:(UIFont *)font;
199+
- (CGSize)drawInRect:(CGRect)rect withFont:(UIFont *)font lineBreakMode:(NSLineBreakMode)lineBreakMode;
200+
- (CGSize)drawInRect:(CGRect)rect withFont:(UIFont *)font lineBreakMode:(NSLineBreakMode)lineBreakMode alignment:(NSTextAlignment)alignment;
201+
- (CGSize)sizeWithFont:(UIFont *)font minFontSize:(CGFloat)minFontSize actualFontSize:(CGFloat *)actualFontSize forWidth:(CGFloat)width lineBreakMode:(NSLineBreakMode)lineBreakMode;
202+
- (CGSize)drawAtPoint:(CGPoint)point forWidth:(CGFloat)width withFont:(UIFont *)font fontSize:(CGFloat)fontSize lineBreakMode:(NSLineBreakMode)lineBreakMode baselineAdjustment:(UIBaselineAdjustment)baselineAdjustment;
203+
- (CGSize)drawAtPoint:(CGPoint)point forWidth:(CGFloat)width withFont:(UIFont *)font minFontSize:(CGFloat)minFontSize actualFontSize:(CGFloat *)actualFontSize lineBreakMode:(NSLineBreakMode)lineBreakMode baselineAdjustment:(UIBaselineAdjustment)baselineAdjustment;
204+
- (CGSize)sizeWithAttributes:(NSDictionary *)attrs;
205+
- (void)drawAtPoint:(CGPoint)point withAttributes:(NSDictionary *)attrs;
206+
- (void)drawInRect:(CGRect)rect withAttributes:(NSDictionary *)attrs;
207+
- (CGSize)size;
208+
- (void)drawAtPoint:(CGPoint)point;
209+
- (void)drawInRect:(CGRect)rect;
210+
- (void)drawWithRect:(CGRect)rect options:(NSStringDrawingOptions)options attributes:(NSDictionary *)attributes context:(NSStringDrawingContext *)context;
211+
- (CGRect)boundingRectWithSize:(CGSize)size options:(NSStringDrawingOptions)options attributes:(NSDictionary *)attributes context:(NSStringDrawingContext *)context;
212+
189213
#pragma clang diagnostic pop
190214

191215
@end

0 commit comments

Comments
 (0)