Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[Dox] Property style cleanup.

  • Loading branch information...
commit 6c004f3c56c0f19f0b170958f1a19bfb2cefc1c1 1 parent b30127a
Jeff Verkoeyen jverkoey authored
Showing with 539 additions and 537 deletions.
  1. +1 −1  src/TTActionSheetController.m
  2. +1 −1  src/TTAlertViewController.m
  3. +4 −4 src/TTButton.m
  4. +1 −1  src/TTSearchTextField.m
  5. +13 −13 src/TTTextEditor.m
  6. +6 −6 src/Three20/TTActivityLabel.h
  7. +3 −3 src/Three20/TTAlertViewController.h
  8. +2 −2 src/Three20/TTButton.h
  9. +2 −2 src/Three20/TTButtonBar.h
  10. +64 −64 src/Three20/TTDefaultStyleSheet.h
  11. +3 −3 src/Three20/TTErrorView.h
  12. +1 −1  src/Three20/TTImageLayer.h
  13. +7 −7 src/Three20/TTImageView.h
  14. +2 −2 src/Three20/TTLabel.h
  15. +4 −4 src/Three20/TTLauncherButton.h
  16. +8 −8 src/Three20/TTLauncherItem.h
  17. +7 −7 src/Three20/TTLauncherView.h
  18. +5 −5 src/Three20/TTLayout.h
  19. +2 −2 src/Three20/TTLink.h
  20. +3 −3 src/Three20/TTListDataSource.h
  21. +21 −19 src/Three20/TTMessageController.h
  22. +2 −2 src/Three20/TTModelViewController.h
  23. +12 −12 src/Three20/TTNavigator.h
  24. +4 −4 src/Three20/TTPageControl.h
  25. +7 −7 src/Three20/TTPhotoSource.h
  26. +4 −4 src/Three20/TTPhotoView.h
  27. +5 −5 src/Three20/TTPhotoViewController.h
  28. +4 −4 src/Three20/TTPickerTextField.h
  29. +4 −4 src/Three20/TTPickerViewCell.h
  30. +5 −5 src/Three20/TTPostController.h
  31. +14 −14 src/Three20/TTScrollView.h
  32. +18 −18 src/Three20/TTSearchBar.h
  33. +2 −2 src/Three20/TTSearchDisplayController.h
  34. +7 −7 src/Three20/TTSearchTextField.h
  35. +5 −5 src/Three20/TTSearchlightLabel.h
  36. +10 −10 src/Three20/TTShape.h
  37. +58 −58 src/Three20/TTStyle.h
  38. +21 −21 src/Three20/TTStyledFrame.h
  39. +5 −5 src/Three20/TTStyledLayout.h
  40. +17 −17 src/Three20/TTStyledNode.h
  41. +13 −13 src/Three20/TTStyledText.h
  42. +10 −10 src/Three20/TTStyledTextLabel.h
  43. +3 −3 src/Three20/TTStyledTextParser.h
  44. +13 −13 src/Three20/TTTabBar.h
  45. +25 −25 src/Three20/TTTableItem.h
  46. +19 −19 src/Three20/TTTableItemCell.h
  47. +3 −3 src/Three20/TTTableView.h
  48. +1 −1  src/Three20/TTTableViewCell.h
  49. +11 −11 src/Three20/TTTableViewController.h
  50. +1 −1  src/Three20/TTTableViewDataSource.h
  51. +1 −1  src/Three20/TTTableViewDelegate.h
  52. +1 −1  src/Three20/TTTableViewDragRefreshDelegate.h
  53. +4 −4 src/Three20/TTTextBarController.h
  54. +10 −10 src/Three20/TTTextEditor.h
  55. +1 −1  src/Three20/TTThumbView.h
  56. +5 −5 src/Three20/TTThumbsTableViewCell.h
  57. +4 −4 src/Three20/TTThumbsViewController.h
  58. +5 −5 src/Three20/TTURLCache.h
  59. +1 −1  src/Three20/TTURLObject.h
  60. +1 −1  src/Three20/TTURLRequest.h
  61. +4 −4 src/Three20/TTURLRequestQueue.h
  62. +2 −2 src/Three20/TTView.h
  63. +1 −1  src/Three20/TTYouTubeView.h
  64. +1 −1  src/Three20/UINSObjectAdditions.h
  65. +2 −2 src/Three20/UITableViewAdditions.h
  66. +19 −19 src/Three20/UIViewAdditions.h
  67. +11 −11 src/Three20/UIViewControllerAdditions.h
  68. +3 −3 src/UIViewControllerAdditions.m
2  src/TTActionSheetController.m
View
@@ -35,7 +35,7 @@ @interface TTActionSheet : UIActionSheet {
UIViewController* _popupViewController;
}
-@property(nonatomic,retain) UIViewController* popupViewController;
+@property (nonatomic, retain) UIViewController* popupViewController;
@end
2  src/TTAlertViewController.m
View
@@ -26,7 +26,7 @@ @interface TTAlertView : UIAlertView {
UIViewController* _popupViewController;
}
-@property(nonatomic,retain) UIViewController* popupViewController;
+@property (nonatomic, retain) UIViewController* popupViewController;
@end
8 src/TTButton.m
View
@@ -43,10 +43,10 @@ @interface TTButtonContent : NSObject <TTURLRequestDelegate> {
TTURLRequest* _request;
}
-@property(nonatomic,copy) NSString* title;
-@property(nonatomic,copy) NSString* imageURL;
-@property(nonatomic,retain) UIImage* image;
-@property(nonatomic,retain) TTStyle* style;
+@property (nonatomic, copy) NSString* title;
+@property (nonatomic, copy) NSString* imageURL;
+@property (nonatomic, retain) UIImage* image;
+@property (nonatomic, retain) TTStyle* style;
- (id)initWithButton:(TTButton*)button;
2  src/TTSearchTextField.m
View
@@ -38,7 +38,7 @@ @interface TTSearchTextFieldInternal : NSObject <UITextFieldDelegate> {
id<UITextFieldDelegate> _delegate;
}
-@property(nonatomic,assign) id<UITextFieldDelegate> delegate;
+@property (nonatomic, assign) id<UITextFieldDelegate> delegate;
- (id)initWithTextField:(TTSearchTextField*)textField;
26 src/TTTextEditor.m
View
@@ -39,8 +39,8 @@ @interface TTTextView : UITextView {
BOOL _overflowed;
}
-@property(nonatomic) BOOL autoresizesToText;
-@property(nonatomic) BOOL overflowed;
+@property (nonatomic) BOOL autoresizesToText;
+@property (nonatomic) BOOL overflowed;
@end
@@ -75,8 +75,8 @@ @interface TTTextEditorInternal : NSObject <UITextViewDelegate, UITextFieldDeleg
BOOL _ignoreBeginAndEnd;
}
-@property(nonatomic,assign) id<TTTextEditorDelegate> delegate;
-@property(nonatomic) BOOL ignoreBeginAndEnd;
+@property (nonatomic, assign) id<TTTextEditorDelegate> delegate;
+@property (nonatomic) BOOL ignoreBeginAndEnd;
- (id)initWithTextEditor:(TTTextEditor*)textEditor;
@@ -229,7 +229,7 @@ - (BOOL)textFieldShouldReturn:(UITextField *)textField {
return NO;
}
}
-
+
[_textEditor performSelector:@selector(didChangeText:) withObject:(id)YES];
if ([_delegate respondsToSelector:@selector(textEditorDidChange:)]) {
@@ -292,7 +292,7 @@ - (CGFloat)heightThatFits:(BOOL*)overflowed numberOfLines:(NSInteger*)numberOfLi
CGFloat minHeight = _minNumberOfLines * ttLineHeight;
CGFloat maxHeight = _maxNumberOfLines * ttLineHeight;
CGFloat maxWidth = self.width - kTextViewInset;
-
+
NSString* text = _textField.hidden ? _textView.text : _textField.text;
if (!text.length) {
text = @"M";
@@ -301,7 +301,7 @@ - (CGFloat)heightThatFits:(BOOL*)overflowed numberOfLines:(NSInteger*)numberOfLi
CGSize textSize = [text sizeWithFont:self.font
constrainedToSize:CGSizeMake(maxWidth, CGFLOAT_MAX)
lineBreakMode:UILineBreakModeWordWrap];
-
+
CGFloat newHeight = textSize.height;
if ([text characterAtIndex:text.length-1] == 10) {
newHeight += ttLineHeight;
@@ -317,14 +317,14 @@ - (CGFloat)heightThatFits:(BOOL*)overflowed numberOfLines:(NSInteger*)numberOfLi
if (numberOfLines) {
*numberOfLines = floor(newHeight / ttLineHeight);
}
-
+
if (newHeight < minHeight) {
newHeight = minHeight;
}
if (maxHeight && newHeight > maxHeight) {
newHeight = maxHeight;
}
-
+
return newHeight + kPaddingY*2;
}
@@ -337,7 +337,7 @@ - (void)constrainToText {
CGFloat oldHeight = self.height;
CGFloat newHeight = [self heightThatFits:&_overflowed numberOfLines:&numberOfLines];
CGFloat diff = newHeight - oldHeight;
-
+
if (numberOfLines > 1 && !_textField.hidden) {
[self createTextView];
_textField.hidden = YES;
@@ -354,17 +354,17 @@ - (void)constrainToText {
[_textField becomeFirstResponder];
[self performSelector:@selector(stopIgnoringBeginAndEnd) withObject:nil afterDelay:0];
}
-
+
_textView.overflowed = _overflowed;
_textView.scrollEnabled = _overflowed;
-
+
if (oldHeight && diff) {
if ([_delegate respondsToSelector:@selector(textEditor:shouldResizeBy:)]) {
if (![_delegate textEditor:self shouldResizeBy:diff]) {
return;
}
}
-
+
self.frame = TTRectContract(self.frame, 0, -diff);
}
}
12 src/Three20/TTActivityLabel.h
View
@@ -40,12 +40,12 @@ typedef enum {
NSTimer* _smoothTimer;
}
-@property(nonatomic,readonly) TTActivityLabelStyle style;
-@property(nonatomic,assign) NSString* text;
-@property(nonatomic,assign) UIFont* font;
-@property(nonatomic) float progress;
-@property(nonatomic) BOOL isAnimating;
-@property(nonatomic) BOOL smoothesProgress;
+@property (nonatomic, readonly) TTActivityLabelStyle style;
+@property (nonatomic, assign) NSString* text;
+@property (nonatomic, assign) UIFont* font;
+@property (nonatomic) float progress;
+@property (nonatomic) BOOL isAnimating;
+@property (nonatomic) BOOL smoothesProgress;
- (id)initWithFrame:(CGRect)frame style:(TTActivityLabelStyle)style;
- (id)initWithFrame:(CGRect)frame style:(TTActivityLabelStyle)style text:(NSString*)text;
6 src/Three20/TTAlertViewController.h
View
@@ -30,9 +30,9 @@
NSMutableArray* _URLs;
}
-@property(nonatomic,assign) id<TTAlertViewControllerDelegate> delegate;
-@property(nonatomic,readonly) UIAlertView* alertView;
-@property(nonatomic,retain) id userInfo;
+@property (nonatomic, assign) id<TTAlertViewControllerDelegate> delegate;
+@property (nonatomic, readonly) UIAlertView* alertView;
+@property (nonatomic, retain) id userInfo;
- (id)initWithTitle:(NSString*)title message:(NSString*)message;
- (id)initWithTitle:(NSString*)title message:(NSString*)message delegate:(id)delegate;
4 src/Three20/TTButton.h
View
@@ -22,8 +22,8 @@
BOOL _isVertical;
}
-@property(nonatomic,retain) UIFont* font;
-@property(nonatomic) BOOL isVertical;
+@property (nonatomic, retain) UIFont* font;
+@property (nonatomic) BOOL isVertical;
+ (TTButton*)buttonWithStyle:(NSString*)selector;
+ (TTButton*)buttonWithStyle:(NSString*)selector title:(NSString*)title;
4 src/Three20/TTButtonBar.h
View
@@ -24,8 +24,8 @@
NSString* _buttonStyle;
}
-@property(nonatomic, retain) NSArray* buttons;
-@property(nonatomic,copy) NSString* buttonStyle;
+@property (nonatomic, retain) NSArray* buttons;
+@property (nonatomic, copy) NSString* buttonStyle;
- (void)addButton:(NSString*)title target:(id)target action:(SEL)selector;
- (void)removeButtons;
128 src/Three20/TTDefaultStyleSheet.h
View
@@ -20,73 +20,73 @@
@interface TTDefaultStyleSheet : TTStyleSheet
-@property(nonatomic,readonly) UIColor* textColor;
-@property(nonatomic,readonly) UIColor* highlightedTextColor;
-@property(nonatomic,readonly) UIColor* placeholderTextColor;
-@property(nonatomic,readonly) UIColor* timestampTextColor;
-@property(nonatomic,readonly) UIColor* linkTextColor;
-@property(nonatomic,readonly) UIColor* moreLinkTextColor;
-@property(nonatomic,readonly) UIColor* selectedTextColor;
-@property(nonatomic,readonly) UIColor* photoCaptionTextColor;
-
-@property(nonatomic,readonly) UIColor* navigationBarTintColor;
-@property(nonatomic,readonly) UIColor* toolbarTintColor;
-@property(nonatomic,readonly) UIColor* searchBarTintColor;
-@property(nonatomic,readonly) UIColor* screenBackgroundColor;
-@property(nonatomic,readonly) UIColor* backgroundColor;
-
-@property(nonatomic,readonly) UIColor* tableActivityTextColor;
-@property(nonatomic,readonly) UIColor* tableErrorTextColor;
-@property(nonatomic,readonly) UIColor* tableSubTextColor;
-@property(nonatomic,readonly) UIColor* tableTitleTextColor;
-@property(nonatomic,readonly) UIColor* tableHeaderTextColor;
-@property(nonatomic,readonly) UIColor* tableHeaderShadowColor;
-@property(nonatomic,readonly) UIColor* tableHeaderTintColor;
-@property(nonatomic,readonly) UIColor* tableSeparatorColor;
-@property(nonatomic,readonly) UIColor* tablePlainBackgroundColor;
-@property(nonatomic,readonly) UIColor* tableGroupedBackgroundColor;
-@property(nonatomic,readonly) UIColor* searchTableBackgroundColor;
-@property(nonatomic,readonly) UIColor* searchTableSeparatorColor;
+@property (nonatomic, readonly) UIColor* textColor;
+@property (nonatomic, readonly) UIColor* highlightedTextColor;
+@property (nonatomic, readonly) UIColor* placeholderTextColor;
+@property (nonatomic, readonly) UIColor* timestampTextColor;
+@property (nonatomic, readonly) UIColor* linkTextColor;
+@property (nonatomic, readonly) UIColor* moreLinkTextColor;
+@property (nonatomic, readonly) UIColor* selectedTextColor;
+@property (nonatomic, readonly) UIColor* photoCaptionTextColor;
+
+@property (nonatomic, readonly) UIColor* navigationBarTintColor;
+@property (nonatomic, readonly) UIColor* toolbarTintColor;
+@property (nonatomic, readonly) UIColor* searchBarTintColor;
+@property (nonatomic, readonly) UIColor* screenBackgroundColor;
+@property (nonatomic, readonly) UIColor* backgroundColor;
+
+@property (nonatomic, readonly) UIColor* tableActivityTextColor;
+@property (nonatomic, readonly) UIColor* tableErrorTextColor;
+@property (nonatomic, readonly) UIColor* tableSubTextColor;
+@property (nonatomic, readonly) UIColor* tableTitleTextColor;
+@property (nonatomic, readonly) UIColor* tableHeaderTextColor;
+@property (nonatomic, readonly) UIColor* tableHeaderShadowColor;
+@property (nonatomic, readonly) UIColor* tableHeaderTintColor;
+@property (nonatomic, readonly) UIColor* tableSeparatorColor;
+@property (nonatomic, readonly) UIColor* tablePlainBackgroundColor;
+@property (nonatomic, readonly) UIColor* tableGroupedBackgroundColor;
+@property (nonatomic, readonly) UIColor* searchTableBackgroundColor;
+@property (nonatomic, readonly) UIColor* searchTableSeparatorColor;
// Table refresh header.
// Used in TTTableViewDragRefreshDelegate.h/m
-@property(nonatomic,readonly) UIFont* tableRefreshHeaderLastUpdatedFont;
-@property(nonatomic,readonly) UIFont* tableRefreshHeaderStatusFont;
-@property(nonatomic,readonly) UIColor* tableRefreshHeaderBackgroundColor;
-@property(nonatomic,readonly) UIColor* tableRefreshHeaderTextColor;
-@property(nonatomic,readonly) UIColor* tableRefreshHeaderTextShadowColor;
-@property(nonatomic,readonly) CGSize tableRefreshHeaderTextShadowOffset;
-@property(nonatomic,readonly) UIImage* tableRefreshHeaderArrowImage;
-
-
-@property(nonatomic,readonly) UIColor* tabTintColor;
-@property(nonatomic,readonly) UIColor* tabBarTintColor;
-
-@property(nonatomic,readonly) UIColor* messageFieldTextColor;
-@property(nonatomic,readonly) UIColor* messageFieldSeparatorColor;
-
-@property(nonatomic,readonly) UIColor* thumbnailBackgroundColor;
-
-@property(nonatomic,readonly) UIColor* postButtonColor;
-
-@property(nonatomic,readonly) UIFont* font;
-@property(nonatomic,readonly) UIFont* buttonFont;
-@property(nonatomic,readonly) UIFont* tableFont;
-@property(nonatomic,readonly) UIFont* tableSmallFont;
-@property(nonatomic,readonly) UIFont* tableTitleFont;
-@property(nonatomic,readonly) UIFont* tableTimestampFont;
-@property(nonatomic,readonly) UIFont* tableButtonFont;
-@property(nonatomic,readonly) UIFont* tableSummaryFont;
-@property(nonatomic,readonly) UIFont* tableHeaderPlainFont;
-@property(nonatomic,readonly) UIFont* tableHeaderGroupedFont;
-@property(nonatomic,readonly) UIFont* photoCaptionFont;
-@property(nonatomic,readonly) UIFont* messageFont;
-@property(nonatomic,readonly) UIFont* errorTitleFont;
-@property(nonatomic,readonly) UIFont* errorSubtitleFont;
-@property(nonatomic,readonly) UIFont* activityLabelFont;
-@property(nonatomic,readonly) UIFont* activityBannerFont;
-
-@property(nonatomic,readonly) UITableViewCellSelectionStyle tableSelectionStyle;
+@property (nonatomic, readonly) UIFont* tableRefreshHeaderLastUpdatedFont;
+@property (nonatomic, readonly) UIFont* tableRefreshHeaderStatusFont;
+@property (nonatomic, readonly) UIColor* tableRefreshHeaderBackgroundColor;
+@property (nonatomic, readonly) UIColor* tableRefreshHeaderTextColor;
+@property (nonatomic, readonly) UIColor* tableRefreshHeaderTextShadowColor;
+@property (nonatomic, readonly) CGSize tableRefreshHeaderTextShadowOffset;
+@property (nonatomic, readonly) UIImage* tableRefreshHeaderArrowImage;
+
+
+@property (nonatomic, readonly) UIColor* tabTintColor;
+@property (nonatomic, readonly) UIColor* tabBarTintColor;
+
+@property (nonatomic, readonly) UIColor* messageFieldTextColor;
+@property (nonatomic, readonly) UIColor* messageFieldSeparatorColor;
+
+@property (nonatomic, readonly) UIColor* thumbnailBackgroundColor;
+
+@property (nonatomic, readonly) UIColor* postButtonColor;
+
+@property (nonatomic, readonly) UIFont* font;
+@property (nonatomic, readonly) UIFont* buttonFont;
+@property (nonatomic, readonly) UIFont* tableFont;
+@property (nonatomic, readonly) UIFont* tableSmallFont;
+@property (nonatomic, readonly) UIFont* tableTitleFont;
+@property (nonatomic, readonly) UIFont* tableTimestampFont;
+@property (nonatomic, readonly) UIFont* tableButtonFont;
+@property (nonatomic, readonly) UIFont* tableSummaryFont;
+@property (nonatomic, readonly) UIFont* tableHeaderPlainFont;
+@property (nonatomic, readonly) UIFont* tableHeaderGroupedFont;
+@property (nonatomic, readonly) UIFont* photoCaptionFont;
+@property (nonatomic, readonly) UIFont* messageFont;
+@property (nonatomic, readonly) UIFont* errorTitleFont;
+@property (nonatomic, readonly) UIFont* errorSubtitleFont;
+@property (nonatomic, readonly) UIFont* activityLabelFont;
+@property (nonatomic, readonly) UIFont* activityBannerFont;
+
+@property (nonatomic, readonly) UITableViewCellSelectionStyle tableSelectionStyle;
- (TTStyle*)selectionFillStyle:(TTStyle*)next;
6 src/Three20/TTErrorView.h
View
@@ -23,9 +23,9 @@
UILabel* _subtitleView;
}
-@property(nonatomic,retain) UIImage* image;
-@property(nonatomic,copy) NSString* title;
-@property(nonatomic,copy) NSString* subtitle;
+@property (nonatomic, retain) UIImage* image;
+@property (nonatomic, copy) NSString* title;
+@property (nonatomic, copy) NSString* subtitle;
- (id)initWithTitle:(NSString*)title subtitle:(NSString*)subtitle image:(UIImage*)image;
2  src/Three20/TTImageLayer.h
View
@@ -25,6 +25,6 @@
TTImageView* _override;
}
-@property(nonatomic,assign) TTImageView* override;
+@property (nonatomic, assign) TTImageView* override;
@end
14 src/Three20/TTImageView.h
View
@@ -37,18 +37,18 @@
* The path of the image. This may be a web path (http://path/to/image.gif) or a local bundle
* path (bundle://path/to/image.png).
*/
-@property(nonatomic,copy) NSString* urlPath;
+@property (nonatomic, copy) NSString* urlPath;
/**
* The default image that is displayed until the image has been downloaded. If no urlPath is
* specified, this image will be displayed indefinitely.
*/
-@property(nonatomic,retain) UIImage* defaultImage;
+@property (nonatomic, retain) UIImage* defaultImage;
/**
* The image that is currently being displayed.
*/
-@property(nonatomic,readonly) UIImage* image;
+@property (nonatomic, readonly) UIImage* image;
/**
* Override the default sizing operation and resize the frame of this view with the size of
@@ -56,22 +56,22 @@
*
* @default NO
*/
-@property(nonatomic) BOOL autoresizesToImage;
+@property (nonatomic) BOOL autoresizesToImage;
/**
* Is an asynchronous request currently active?
*/
-@property(nonatomic,readonly) BOOL isLoading;
+@property (nonatomic, readonly) BOOL isLoading;
/**
* Has the image been successfully loaded?
*/
-@property(nonatomic,readonly) BOOL isLoaded;
+@property (nonatomic, readonly) BOOL isLoaded;
/**
* A delegate that notifies you when the image has started and finished loading.
*/
-@property(nonatomic,assign) id<TTImageViewDelegate> delegate;
+@property (nonatomic, assign) id<TTImageViewDelegate> delegate;
/**
* Cancel any pending request, remove the image, and redraw the view.
4 src/Three20/TTLabel.h
View
@@ -21,8 +21,8 @@
UIFont* _font;
}
-@property(nonatomic,copy) NSString* text;
-@property(nonatomic,retain) UIFont* font;
+@property (nonatomic, copy) NSString* text;
+@property (nonatomic, retain) UIFont* font;
- (id)initWithText:(NSString*)text;
8 src/Three20/TTLauncherButton.h
View
@@ -26,10 +26,10 @@
BOOL _editing;
}
-@property(nonatomic,readonly) TTLauncherItem* item;
-@property(nonatomic,readonly) TTButton* closeButton;
-@property(nonatomic) BOOL dragging;
-@property(nonatomic) BOOL editing;
+@property (nonatomic, readonly) TTLauncherItem* item;
+@property (nonatomic, readonly) TTButton* closeButton;
+@property (nonatomic) BOOL dragging;
+@property (nonatomic) BOOL editing;
- (id)initWithItem:(TTLauncherItem*)item;
16 src/Three20/TTLauncherItem.h
View
@@ -29,16 +29,16 @@
BOOL _canDelete;
}
-@property(nonatomic,assign) TTLauncherView* launcher;
-@property(nonatomic,copy) NSString* title;
-@property(nonatomic,copy) NSString* image;
-@property(nonatomic,copy) NSString* URL;
-@property(nonatomic,copy) NSString* style;
-@property(nonatomic) NSInteger badgeNumber;
-@property(nonatomic) BOOL canDelete;
+@property (nonatomic, assign) TTLauncherView* launcher;
+@property (nonatomic, copy) NSString* title;
+@property (nonatomic, copy) NSString* image;
+@property (nonatomic, copy) NSString* URL;
+@property (nonatomic, copy) NSString* style;
+@property (nonatomic) NSInteger badgeNumber;
+@property (nonatomic) BOOL canDelete;
- (id)initWithTitle:(NSString*)title image:(NSString*)image URL:(NSString*)URL;
- (id)initWithTitle:(NSString*)title image:(NSString*)image URL:(NSString*)URL
canDelete:(BOOL)canDelete;
-@end
+@end
14 src/Three20/TTLauncherView.h
View
@@ -43,37 +43,37 @@
/**
*
*/
-@property(nonatomic,assign) id<TTLauncherViewDelegate> delegate;
+@property (nonatomic, assign) id<TTLauncherViewDelegate> delegate;
/**
*
*/
-@property(nonatomic,copy) NSArray* pages;
+@property (nonatomic, copy) NSArray* pages;
/**
*
*/
-@property(nonatomic) NSInteger columnCount;
+@property (nonatomic) NSInteger columnCount;
/**
*
*/
-@property(nonatomic,readonly) NSInteger rowCount;
+@property (nonatomic, readonly) NSInteger rowCount;
/**
*
*/
-@property(nonatomic) NSInteger currentPageIndex;
+@property (nonatomic) NSInteger currentPageIndex;
/**
*
*/
-@property(nonatomic,copy) NSString* prompt;
+@property (nonatomic, copy) NSString* prompt;
/**
*
*/
-@property(nonatomic,readonly) BOOL editing;
+@property (nonatomic, readonly) BOOL editing;
/**
*
10 src/Three20/TTLayout.h
View
@@ -30,8 +30,8 @@
CGFloat _spacing;
}
-@property(nonatomic) CGFloat padding;
-@property(nonatomic) CGFloat spacing;
+@property (nonatomic) CGFloat padding;
+@property (nonatomic) CGFloat spacing;
@end
@@ -43,8 +43,8 @@
CGFloat _spacing;
}
-@property(nonatomic) NSInteger columnCount;
-@property(nonatomic) CGFloat padding;
-@property(nonatomic) CGFloat spacing;
+@property (nonatomic) NSInteger columnCount;
+@property (nonatomic) CGFloat padding;
+@property (nonatomic) CGFloat spacing;
@end
4 src/Three20/TTLink.h
View
@@ -28,11 +28,11 @@
* The URL that will be loaded when the control is touched. This is a wrapper around URLAction;
* setting this property is equivalent to setting a URLAction with animated set to YES.
*/
-@property(nonatomic,copy) id URL;
+@property (nonatomic, copy) id URL;
/**
* The TTURLAction that will be opened.
*/
-@property(nonatomic,retain) TTURLAction* URLAction;
+@property (nonatomic, retain) TTURLAction* URLAction;
@end
6 src/Three20/TTListDataSource.h
View
@@ -22,7 +22,7 @@
NSMutableArray* _items;
}
-@property(nonatomic,retain) NSMutableArray* items;
+@property (nonatomic, retain) NSMutableArray* items;
+ (TTListDataSource*)dataSourceWithObjects:(id)object,...;
+ (TTListDataSource*)dataSourceWithItems:(NSMutableArray*)items;
@@ -40,8 +40,8 @@
NSMutableArray* _items;
}
-@property(nonatomic,retain) NSMutableArray* items;
-@property(nonatomic,retain) NSMutableArray* sections;
+@property (nonatomic, retain) NSMutableArray* items;
+@property (nonatomic, retain) NSMutableArray* sections;
/**
* Objects should be in this format:
40 src/Three20/TTMessageController.h
View
@@ -35,62 +35,64 @@
* useful when you want to customize the fields presented to the user.
*/
@interface TTMessageController : TTViewController <UITextFieldDelegate, TTTextEditorDelegate> {
- id<TTMessageControllerDelegate> _delegate;
- id<TTTableViewDataSource> _dataSource;
- NSArray* _fields;
- NSMutableArray* _fieldViews;
- UIScrollView* _scrollView;
- TTTextEditor* _textEditor;
- TTActivityLabel* _activityView;
- NSArray* _initialRecipients;
+ NSArray* _fields;
+ NSMutableArray* _fieldViews;
+ UIScrollView* _scrollView;
+ TTTextEditor* _textEditor;
+ TTActivityLabel* _activityView;
+ NSArray* _initialRecipients;
+
BOOL _showsRecipientPicker;
BOOL _isModified;
+
+ id<TTTableViewDataSource> _dataSource;
+ id<TTMessageControllerDelegate> _delegate;
}
/**
* The delegate that will receive messages from the TTMessageControllerDelegate
* protocol.
*/
-@property(nonatomic,assign) id<TTMessageControllerDelegate> delegate;
+@property (nonatomic, assign) id<TTMessageControllerDelegate> delegate;
/**
* The datasource used to autocomplete TTMessageRecipientFields. This class is
* also responsible for determining how cells representing recipients are
* labeled.
*/
-@property(nonatomic,retain) id<TTTableViewDataSource> dataSource;
+@property (nonatomic, retain) id<TTTableViewDataSource> dataSource;
/**
* An array of TTMessageField instances representing the editable fields. These
* fields are rendered in order using appropriate views for each field type.
*/
-@property(nonatomic,retain) NSArray* fields;
+@property (nonatomic, retain) NSArray* fields;
/**
* A convenience property for editing the text value of the
* TTMessageSubjectField. If no TTMessageSubjectField is found in the fields
* array, nil will be returned from the getter and the setter will be a no-op.
*/
-@property(nonatomic,retain) NSString* subject;
+@property (nonatomic, retain) NSString* subject;
/**
* The body of the message. The body is not required for the user to send a
* message.
*/
-@property(nonatomic,retain) NSString* body;
+@property (nonatomic, retain) NSString* body;
/**
* Controls whether a contact add button is shown in the views for
* TTMessageRecipientField instances.
*/
-@property(nonatomic) BOOL showsRecipientPicker;
+@property (nonatomic) BOOL showsRecipientPicker;
/**
* Indicates if this message has been modified since it was originally
* shown. If the message has been modified, the user will be asked for
* confirmation before their cancel request is enacted.
*/
-@property(nonatomic,readonly) BOOL isModified;
+@property (nonatomic, readonly) BOOL isModified;
/**
* Initializes the class with an array of recipients. These recipients will
@@ -249,13 +251,13 @@
* The title of this field, which will be rendered along with the field's
* contents.
*/
-@property(nonatomic,copy) NSString* title;
+@property (nonatomic,copy) NSString* title;
/**
* If true, the user must supply a value for this field before they will be
* able to send their message.
*/
-@property(nonatomic) BOOL required;
+@property (nonatomic) BOOL required;
- (id)initWithTitle:(NSString*)title required:(BOOL)required;
@@ -270,7 +272,7 @@
NSArray* _recipients;
}
-@property(nonatomic,retain) NSArray* recipients;
+@property (nonatomic, retain) NSArray* recipients;
@end
@@ -281,7 +283,7 @@
NSString* _text;
}
-@property(nonatomic,copy) NSString* text;
+@property (nonatomic, copy) NSString* text;
@end
4 src/Three20/TTModelViewController.h
View
@@ -41,12 +41,12 @@
} _flags;
}
-@property(nonatomic,retain) id<TTModel> model;
+@property (nonatomic, retain) id<TTModel> model;
/**
* An error that occurred while trying to load content.
*/
-@property(nonatomic, retain) NSError* modelError;
+@property (nonatomic, retain) NSError* modelError;
/**
* Creates the model that the controller manages.
24 src/Three20/TTNavigator.h
View
@@ -50,14 +50,14 @@ typedef enum {
BOOL _opensExternalURLs;
}
-@property(nonatomic,assign) id<TTNavigatorDelegate> delegate;
+@property (nonatomic, assign) id<TTNavigatorDelegate> delegate;
/**
* The URL map used to translate between URLs and view controllers.
*
* @see TTURLMap
*/
-@property(nonatomic,readonly) TTURLMap* URLMap;
+@property (nonatomic, readonly) TTURLMap* URLMap;
/**
* The window that contains the view controller hierarchy.
@@ -65,17 +65,17 @@ typedef enum {
* By default retrieves the keyWindow. If there is no keyWindow, creates a new
* TTNavigatorWindow.
*/
-@property(nonatomic,retain) UIWindow* window;
+@property (nonatomic, retain) UIWindow* window;
/**
* The controller that is at the root of the view controller hierarchy.
*/
-@property(nonatomic,readonly) UIViewController* rootViewController;
+@property (nonatomic, readonly) UIViewController* rootViewController;
/**
* The currently visible view controller.
*/
-@property(nonatomic,readonly) UIViewController* visibleViewController;
+@property (nonatomic, readonly) UIViewController* visibleViewController;
/**
* The view controller that is currently on top of the navigation stack.
@@ -83,21 +83,21 @@ typedef enum {
* This differs from visibleViewController in that it ignores things like search
* display controllers which are visible, but not part of navigation.
*/
-@property(nonatomic,readonly) UIViewController* topViewController;
+@property (nonatomic, readonly) UIViewController* topViewController;
/**
* The URL of the currently visible view controller;
*
* Setting this property will open a new URL.
*/
-@property(nonatomic,copy) NSString* URL;
+@property (nonatomic, copy) NSString* URL;
/**
* How view controllers are automatically persisted on termination and restored on launch.
*
* @default TTNavigatorPersistenceModeNone
*/
-@property(nonatomic) TTNavigatorPersistenceMode persistenceMode;
+@property (nonatomic) TTNavigatorPersistenceMode persistenceMode;
/**
* The age at which persisted view controllers are too old to be restored.
@@ -110,28 +110,28 @@ typedef enum {
*
* @default 0
*/
-@property(nonatomic) NSTimeInterval persistenceExpirationAge;
+@property (nonatomic) NSTimeInterval persistenceExpirationAge;
/**
* Causes the current view controller to be reloaded when shaking the phone.
*
* @default NO
*/
-@property(nonatomic) BOOL supportsShakeToReload;
+@property (nonatomic) BOOL supportsShakeToReload;
/**
* Allows URLs to be opened externally if they don't match any patterns.
*
* @default NO
*/
-@property(nonatomic) BOOL opensExternalURLs;
+@property (nonatomic) BOOL opensExternalURLs;
/**
* Indicates that we are asking controllers to delay heavy operations until a later time.
*
* @default NO
*/
-@property(nonatomic,readonly) BOOL isDelayed;
+@property (nonatomic, readonly) BOOL isDelayed;
+ (TTNavigator*)navigator;
8 src/Three20/TTPageControl.h
View
@@ -31,9 +31,9 @@
BOOL _hidesForSinglePage;
}
-@property(nonatomic) NSInteger numberOfPages;
-@property(nonatomic) NSInteger currentPage;
-@property(nonatomic,copy) NSString* dotStyle;
-@property(nonatomic) BOOL hidesForSinglePage;
+@property (nonatomic) NSInteger numberOfPages;
+@property (nonatomic) NSInteger currentPage;
+@property (nonatomic, copy) NSString* dotStyle;
+@property (nonatomic) BOOL hidesForSinglePage;
@end
14 src/Three20/TTPhotoSource.h
View
@@ -39,17 +39,17 @@ typedef enum {
/**
* The title of this collection of photos.
*/
-@property(nonatomic,copy) NSString* title;
+@property (nonatomic, copy) NSString* title;
/**
* The total number of photos in the source, independent of the number that have been loaded.
*/
-@property(nonatomic,readonly) NSInteger numberOfPhotos;
+@property (nonatomic, readonly) NSInteger numberOfPhotos;
/**
* The maximum index of photos that have already been loaded.
*/
-@property(nonatomic,readonly) NSInteger maxPhotoIndex;
+@property (nonatomic, readonly) NSInteger maxPhotoIndex;
/**
*
@@ -65,22 +65,22 @@ typedef enum {
/**
* The photo source that the photo belongs to.
*/
-@property(nonatomic,assign) id<TTPhotoSource> photoSource;
+@property (nonatomic, assign) id<TTPhotoSource> photoSource;
/**
* The index of the photo within its photo source.
*/
-@property(nonatomic) CGSize size;
+@property (nonatomic) CGSize size;
/**
* The index of the photo within its photo source.
*/
-@property(nonatomic) NSInteger index;
+@property (nonatomic) NSInteger index;
/**
* The caption of the photo.
*/
-@property(nonatomic,copy) NSString* caption;
+@property (nonatomic, copy) NSString* caption;
/**
* Gets the URL of one of the differently sized versions of the photo.
8 src/Three20/TTPhotoView.h
View
@@ -31,10 +31,10 @@
BOOL _hidesCaption;
}
-@property(nonatomic,retain) id<TTPhoto> photo;
-@property(nonatomic,retain) TTStyle* captionStyle;
-@property(nonatomic) BOOL hidesExtras;
-@property(nonatomic) BOOL hidesCaption;
+@property (nonatomic, retain) id<TTPhoto> photo;
+@property (nonatomic, retain) TTStyle* captionStyle;
+@property (nonatomic) BOOL hidesExtras;
+@property (nonatomic) BOOL hidesCaption;
- (BOOL)loadPreview:(BOOL)fromNetwork;
- (void)loadImage;
10 src/Three20/TTPhotoViewController.h
View
@@ -43,14 +43,14 @@
/**
* The source of a sequential photo collection that will be displayed.
*/
-@property(nonatomic,retain) id<TTPhotoSource> photoSource;
+@property (nonatomic, retain) id<TTPhotoSource> photoSource;
/**
* The photo that is currently visible and centered.
*
* You can assign this directly to change the photoSource to the one that contains the photo.
*/
-@property(nonatomic,retain) id<TTPhoto> centerPhoto;
+@property (nonatomic, retain) id<TTPhoto> centerPhoto;
/**
* The index of the currently visible photo.
@@ -58,17 +58,17 @@
* Because centerPhoto can be nil while waiting for the source to load the photo, this property
* must be maintained even though centerPhoto has its own index property.
*/
-@property(nonatomic,readonly) NSInteger centerPhotoIndex;
+@property (nonatomic, readonly) NSInteger centerPhotoIndex;
/**
* The default image to show before a photo has been loaded.
*/
-@property(nonatomic,retain) UIImage* defaultImage;
+@property (nonatomic, retain) UIImage* defaultImage;
/**
* The style to use for the caption label.
*/
-@property(nonatomic,retain) TTStyle* captionStyle;
+@property (nonatomic, retain) TTStyle* captionStyle;
- (id)initWithPhoto:(id<TTPhoto>)photo;
- (id)initWithPhotoSource:(id<TTPhotoSource>)photoSource;
8 src/Three20/TTPickerTextField.h
View
@@ -25,10 +25,10 @@
CGPoint _cursorOrigin;
}
-@property(nonatomic,readonly) NSArray* cellViews;
-@property(nonatomic,readonly) NSArray* cells;
-@property(nonatomic,assign) TTPickerViewCell* selectedCell;
-@property(nonatomic,readonly) int lineCount;
+@property (nonatomic, readonly) NSArray* cellViews;
+@property (nonatomic, readonly) NSArray* cells;
+@property (nonatomic, assign) TTPickerViewCell* selectedCell;
+@property (nonatomic, readonly) int lineCount;
- (void)addCellWithObject:(id)object;
8 src/Three20/TTPickerViewCell.h
View
@@ -22,9 +22,9 @@
BOOL _selected;
}
-@property(nonatomic,retain) id object;
-@property(nonatomic,copy) NSString* label;
-@property(nonatomic,retain) UIFont* font;
-@property(nonatomic) BOOL selected;
+@property (nonatomic, retain) id object;
+@property (nonatomic, copy) NSString* label;
+@property (nonatomic, retain) UIFont* font;
+@property (nonatomic) BOOL selected;
@end
10 src/Three20/TTPostController.h
View
@@ -34,11 +34,11 @@
UIStatusBarStyle _originalStatusBarStyle;
}
-@property(nonatomic,assign) id<TTPostControllerDelegate> delegate;
-@property(nonatomic,retain) id result;
-@property(nonatomic,readonly) UITextView* textView;
-@property(nonatomic,readonly) UINavigationBar* navigatorBar;
-@property(nonatomic,retain) UIView* originView;
+@property (nonatomic, assign) id<TTPostControllerDelegate> delegate;
+@property (nonatomic, retain) id result;
+@property (nonatomic, readonly) UITextView* textView;
+@property (nonatomic, readonly) UINavigationBar* navigatorBar;
+@property (nonatomic, retain) UIView* originView;
/**
* Posts the text to delegates, who have to actually do something with it.
28 src/Three20/TTScrollView.h
View
@@ -70,54 +70,54 @@
/**
* The current page index.
*/
-@property(nonatomic) NSInteger centerPageIndex;
+@property (nonatomic) NSInteger centerPageIndex;
/**
* Whether or not the current page is zoomed.
*/
-@property(nonatomic,readonly) BOOL zoomed;
+@property (nonatomic, readonly) BOOL zoomed;
-@property(nonatomic,readonly) BOOL holding;
+@property (nonatomic, readonly) BOOL holding;
/**
* @default YES
*/
-@property(nonatomic) BOOL scrollEnabled;
+@property (nonatomic) BOOL scrollEnabled;
/**
* @default YES
*/
-@property(nonatomic) BOOL zoomEnabled;
+@property (nonatomic) BOOL zoomEnabled;
/**
* @default YES
*/
-@property(nonatomic) BOOL rotateEnabled;
+@property (nonatomic) BOOL rotateEnabled;
/**
* @default 40
*/
-@property(nonatomic) CGFloat pageSpacing;
+@property (nonatomic) CGFloat pageSpacing;
-@property(nonatomic) UIInterfaceOrientation orientation;
-@property(nonatomic,readonly) NSInteger numberOfPages;
-@property(nonatomic,readonly) UIView* centerPage;
+@property (nonatomic) UIInterfaceOrientation orientation;
+@property (nonatomic, readonly) NSInteger numberOfPages;
+@property (nonatomic, readonly) UIView* centerPage;
/**
* The number of seconds to wait before initiating the "hold" action.
*
* @default 0
*/
-@property(nonatomic) NSTimeInterval holdsAfterTouchingForInterval;
+@property (nonatomic) NSTimeInterval holdsAfterTouchingForInterval;
-@property(nonatomic,assign) id<TTScrollViewDelegate> delegate;
-@property(nonatomic,assign) id<TTScrollViewDataSource> dataSource;
+@property (nonatomic, assign) id<TTScrollViewDelegate> delegate;
+@property (nonatomic, assign) id<TTScrollViewDataSource> dataSource;
/**
* A dictionary of visible pages keyed by the index of the page.
*/
-@property(nonatomic,readonly) NSDictionary* visiblePages;
+@property (nonatomic, readonly) NSDictionary* visiblePages;
- (void)setOrientation:(UIInterfaceOrientation)orientation animated:(BOOL)animated;
36 src/Three20/TTSearchBar.h
View
@@ -29,24 +29,24 @@
BOOL _showsSearchIcon;
}
-@property(nonatomic,assign) id<UITextFieldDelegate> delegate;
-@property(nonatomic,retain) id<TTTableViewDataSource> dataSource;
-@property(nonatomic,copy) NSString* text;
-@property(nonatomic,copy) NSString* placeholder;
-@property(nonatomic,readonly) UITableView* tableView;
-@property(nonatomic,readonly) TTView* boxView;
-@property(nonatomic,retain) UIColor* tintColor;
-@property(nonatomic,retain) UIColor* textColor;
-@property(nonatomic,retain) UIFont* font;
-@property(nonatomic,retain) TTStyle* textFieldStyle;
-@property(nonatomic) UIReturnKeyType returnKeyType;
-@property(nonatomic) CGFloat rowHeight;
-@property(nonatomic,readonly) BOOL editing;
-@property(nonatomic) BOOL searchesAutomatically;
-@property(nonatomic) BOOL showsCancelButton;
-@property(nonatomic) BOOL showsDoneButton;
-@property(nonatomic) BOOL showsDarkScreen;
-@property(nonatomic) BOOL showsSearchIcon;
+@property (nonatomic, assign) id<UITextFieldDelegate> delegate;
+@property (nonatomic, retain) id<TTTableViewDataSource> dataSource;
+@property (nonatomic, copy) NSString* text;
+@property (nonatomic, copy) NSString* placeholder;
+@property (nonatomic, readonly) UITableView* tableView;
+@property (nonatomic, readonly) TTView* boxView;
+@property (nonatomic, retain) UIColor* tintColor;
+@property (nonatomic, retain) UIColor* textColor;
+@property (nonatomic, retain) UIFont* font;
+@property (nonatomic, retain) TTStyle* textFieldStyle;
+@property (nonatomic) UIReturnKeyType returnKeyType;
+@property (nonatomic) CGFloat rowHeight;
+@property (nonatomic, readonly) BOOL editing;
+@property (nonatomic) BOOL searchesAutomatically;
+@property (nonatomic) BOOL showsCancelButton;
+@property (nonatomic) BOOL showsDoneButton;
+@property (nonatomic) BOOL showsDarkScreen;
+@property (nonatomic) BOOL showsSearchIcon;
- (void)search;
4 src/Three20/TTSearchDisplayController.h
View
@@ -37,7 +37,7 @@
BOOL _pausesBeforeSearching;
}
-@property(nonatomic,retain) TTTableViewController* searchResultsViewController;
-@property(nonatomic) BOOL pausesBeforeSearching;
+@property (nonatomic, retain) TTTableViewController* searchResultsViewController;
+@property (nonatomic) BOOL pausesBeforeSearching;
@end
14 src/Three20/TTSearchTextField.h
View
@@ -35,13 +35,13 @@
BOOL _showsDarkScreen;
}
-@property(nonatomic,retain) id<TTTableViewDataSource> dataSource;
-@property(nonatomic,readonly) UITableView* tableView;
-@property(nonatomic) CGFloat rowHeight;
-@property(nonatomic,readonly) BOOL hasText;
-@property(nonatomic) BOOL searchesAutomatically;
-@property(nonatomic) BOOL showsDoneButton;
-@property(nonatomic) BOOL showsDarkScreen;
+@property (nonatomic, retain) id<TTTableViewDataSource> dataSource;
+@property (nonatomic, readonly) UITableView* tableView;
+@property (nonatomic) CGFloat rowHeight;
+@property (nonatomic, readonly) BOOL hasText;
+@property (nonatomic) BOOL searchesAutomatically;
+@property (nonatomic) BOOL showsDoneButton;
+@property (nonatomic) BOOL showsDarkScreen;
- (void)search;
10 src/Three20/TTSearchlightLabel.h
View
@@ -29,11 +29,11 @@
void* _maskData;
}
-@property(nonatomic,copy) NSString* text;
-@property(nonatomic,retain) UIFont* font;
-@property(nonatomic,retain) UIColor* textColor;
-@property(nonatomic,retain) UIColor* spotlightColor;
-@property(nonatomic) UITextAlignment textAlignment;
+@property (nonatomic, copy) NSString* text;
+@property (nonatomic, retain) UIFont* font;
+@property (nonatomic, retain) UIColor* textColor;
+@property (nonatomic, retain) UIColor* spotlightColor;
+@property (nonatomic) UITextAlignment textAlignment;
- (void)startAnimating;
- (void)stopAnimating;
20 src/Three20/TTShape.h
View
@@ -55,10 +55,10 @@
CGFloat _bottomLeftRadius;
}
-@property(nonatomic) CGFloat topLeftRadius;
-@property(nonatomic) CGFloat topRightRadius;
-@property(nonatomic) CGFloat bottomRightRadius;
-@property(nonatomic) CGFloat bottomLeftRadius;
+@property (nonatomic) CGFloat topLeftRadius;
+@property (nonatomic) CGFloat topRightRadius;
+@property (nonatomic) CGFloat bottomRightRadius;
+@property (nonatomic) CGFloat bottomLeftRadius;
+ (TTRoundedRectangleShape*)shapeWithRadius:(CGFloat)radius;
@@ -73,7 +73,7 @@
CGFloat _radius;
}
-@property(nonatomic) CGFloat radius;
+@property (nonatomic) CGFloat radius;
+ (TTRoundedRightArrowShape*)shapeWithRadius:(CGFloat)radius;
@@ -85,7 +85,7 @@
CGFloat _radius;
}
-@property(nonatomic) CGFloat radius;
+@property (nonatomic) CGFloat radius;
+ (TTRoundedLeftArrowShape*)shapeWithRadius:(CGFloat)radius;
@@ -100,10 +100,10 @@
CGSize _pointSize;
}
-@property(nonatomic) CGFloat radius;
-@property(nonatomic) CGFloat pointLocation;
-@property(nonatomic) CGFloat pointAngle;
-@property(nonatomic) CGSize pointSize;
+@property (nonatomic) CGFloat radius;
+@property (nonatomic) CGFloat pointLocation;
+@property (nonatomic) CGFloat pointAngle;
+@property (nonatomic) CGSize pointSize;
+ (TTSpeechBubbleShape*)shapeWithRadius:(CGFloat)radius pointLocation:(CGFloat)pointLocation
pointAngle:(CGFloat)pointAngle pointSize:(CGSize)pointSize;
116 src/Three20/TTStyle.h
View
@@ -28,12 +28,12 @@
BOOL _didDrawContent;
}
-@property(nonatomic,assign) id<TTStyleDelegate> delegate;
-@property(nonatomic) CGRect frame;
-@property(nonatomic) CGRect contentFrame;
-@property(nonatomic,retain) TTShape* shape;
-@property(nonatomic,retain) UIFont* font;
-@property(nonatomic) BOOL didDrawContent;
+@property (nonatomic, assign) id<TTStyleDelegate> delegate;
+@property (nonatomic) CGRect frame;
+@property (nonatomic) CGRect contentFrame;
+@property (nonatomic, retain) TTShape* shape;
+@property (nonatomic, retain) UIFont* font;
+@property (nonatomic) BOOL didDrawContent;
@end
@@ -43,7 +43,7 @@
TTStyle* _next;
}
-@property(nonatomic,retain) TTStyle* next;
+@property (nonatomic, retain) TTStyle* next;
- (id)initWithNext:(TTStyle*)next;
@@ -76,8 +76,8 @@
TTStyle* _style;
}
-@property(nonatomic,copy) NSString* name;
-@property(nonatomic,retain) TTStyle* style;
+@property (nonatomic, copy) NSString* name;
+@property (nonatomic, retain) TTStyle* style;
+ (TTPartStyle*)styleWithName:(NSString*)name style:(TTStyle*)style next:(TTStyle*)next;
@@ -94,7 +94,7 @@
TTShape* _shape;
}
-@property(nonatomic,retain) TTShape* shape;
+@property (nonatomic, retain) TTShape* shape;
+ (TTShapeStyle*)styleWithShape:(TTShape*)shape next:(TTStyle*)next;
@@ -106,7 +106,7 @@
UIEdgeInsets _inset;
}
-@property(nonatomic) UIEdgeInsets inset;
+@property (nonatomic) UIEdgeInsets inset;
+ (TTInsetStyle*)styleWithInset:(UIEdgeInsets)inset next:(TTStyle*)next;
@@ -121,10 +121,10 @@
TTPosition _position;
}
-@property(nonatomic) UIEdgeInsets margin;
-@property(nonatomic) UIEdgeInsets padding;
-@property(nonatomic) CGSize minSize;
-@property(nonatomic) TTPosition position;
+@property (nonatomic) UIEdgeInsets margin;
+@property (nonatomic) UIEdgeInsets padding;
+@property (nonatomic) CGSize minSize;
+@property (nonatomic) TTPosition position;
+ (TTBoxStyle*)styleWithMargin:(UIEdgeInsets)margin next:(TTStyle*)next;
+ (TTBoxStyle*)styleWithPadding:(UIEdgeInsets)padding next:(TTStyle*)next;
@@ -150,15 +150,15 @@
UILineBreakMode _lineBreakMode;
}
-@property(nonatomic,retain) UIFont* font;
-@property(nonatomic,retain) UIColor* color;
-@property(nonatomic,retain) UIColor* shadowColor;
-@property(nonatomic) CGFloat minimumFontSize;
-@property(nonatomic) CGSize shadowOffset;
-@property(nonatomic) NSInteger numberOfLines;
-@property(nonatomic) UITextAlignment textAlignment;
-@property(nonatomic) UIControlContentVerticalAlignment verticalAlignment;
-@property(nonatomic) UILineBreakMode lineBreakMode;
+@property (nonatomic, retain) UIFont* font;
+@property (nonatomic, retain) UIColor* color;
+@property (nonatomic, retain) UIColor* shadowColor;
+@property (nonatomic) CGFloat minimumFontSize;
+@property (nonatomic) CGSize shadowOffset;
+@property (nonatomic) NSInteger numberOfLines;
+@property (nonatomic) UITextAlignment textAlignment;
+@property (nonatomic) UIControlContentVerticalAlignment verticalAlignment;
+@property (nonatomic) UILineBreakMode lineBreakMode;
+ (TTTextStyle*)styleWithFont:(UIFont*)font next:(TTStyle*)next;
+ (TTTextStyle*)styleWithColor:(UIColor*)color next:(TTStyle*)next;
@@ -192,11 +192,11 @@
CGSize _size;
}
-@property(nonatomic,copy) NSString* imageURL;
-@property(nonatomic,retain) UIImage* image;
-@property(nonatomic,retain) UIImage* defaultImage;
-@property(nonatomic) CGSize size;
-@property(nonatomic) UIViewContentMode contentMode;
+@property (nonatomic, copy) NSString* imageURL;
+@property (nonatomic, retain) UIImage* image;
+@property (nonatomic, retain) UIImage* defaultImage;
+@property (nonatomic) CGSize size;
+@property (nonatomic) UIViewContentMode contentMode;
+ (TTImageStyle*)styleWithImageURL:(NSString*)imageURL next:(TTStyle*)next;
+ (TTImageStyle*)styleWithImageURL:(NSString*)imageURL defaultImage:(UIImage*)defaultImage
@@ -219,7 +219,7 @@
UIImage* _mask;
}
-@property(nonatomic,retain) UIImage* mask;
+@property (nonatomic, retain) UIImage* mask;
+ (TTMaskStyle*)styleWithMask:(UIImage*)mask next:(TTStyle*)next;
@@ -231,7 +231,7 @@
CGBlendMode _blendMode;
}
-@property(nonatomic) CGBlendMode blendMode;
+@property (nonatomic) CGBlendMode blendMode;
+ (TTBlendStyle*)styleWithBlend:(CGBlendMode)blendMode next:(TTStyle*)next;
@@ -243,7 +243,7 @@
UIColor* _color;
}
-@property(nonatomic,retain) UIColor* color;
+@property (nonatomic, retain) UIColor* color;
+ (TTSolidFillStyle*)styleWithColor:(UIColor*)color next:(TTStyle*)next;
@@ -256,8 +256,8 @@
UIColor* _color2;
}
-@property(nonatomic,retain) UIColor* color1;
-@property(nonatomic,retain) UIColor* color2;
+@property (nonatomic, retain) UIColor* color1;
+@property (nonatomic, retain) UIColor* color2;
+ (TTLinearGradientFillStyle*)styleWithColor1:(UIColor*)color1 color2:(UIColor*)color2
next:(TTStyle*)next;
@@ -271,8 +271,8 @@
BOOL _withBottomHighlight;
}
-@property(nonatomic,retain) UIColor* color;
-@property(nonatomic,assign) BOOL withBottomHighlight;
+@property (nonatomic, retain) UIColor* color;
+@property (nonatomic, assign) BOOL withBottomHighlight;
+ (TTReflectiveFillStyle*)styleWithColor:(UIColor*)color next:(TTStyle*)next;
+ (TTReflectiveFillStyle*)styleWithColor:(UIColor*)color
@@ -288,9 +288,9 @@
CGSize _offset;
}
-@property(nonatomic,retain) UIColor* color;
-@property(nonatomic) CGFloat blur;
-@property(nonatomic) CGSize offset;
+@property (nonatomic, retain) UIColor* color;
+@property (nonatomic) CGFloat blur;
+@property (nonatomic) CGSize offset;
+ (TTShadowStyle*)styleWithColor:(UIColor*)color blur:(CGFloat)blur offset:(CGSize)offset
next:(TTStyle*)next;
@@ -309,8 +309,8 @@
CGFloat _width;
}
-@property(nonatomic,retain) UIColor* color;
-@property(nonatomic) CGFloat width;
+@property (nonatomic, retain) UIColor* color;
+@property (nonatomic) CGFloat width;
+ (TTSolidBorderStyle*)styleWithColor:(UIColor*)color width:(CGFloat)width next:(TTStyle*)next;
@@ -324,9 +324,9 @@
CGFloat _width;
}
-@property(nonatomic,retain) UIColor* color;
-@property(nonatomic,retain) UIColor* highlightColor;
-@property(nonatomic) CGFloat width;
+@property (nonatomic, retain) UIColor* color;
+@property (nonatomic, retain) UIColor* highlightColor;
+@property (nonatomic) CGFloat width;
+ (TTHighlightBorderStyle*)styleWithColor:(UIColor*)color highlightColor:(UIColor*)highlightColor
width:(CGFloat)width next:(TTStyle*)next;
@@ -343,11 +343,11 @@
CGFloat _width;
}
-@property(nonatomic,retain) UIColor* top;
-@property(nonatomic,retain) UIColor* right;
-@property(nonatomic,retain) UIColor* bottom;
-@property(nonatomic,retain) UIColor* left;
-@property(nonatomic) CGFloat width;
+@property (nonatomic, retain) UIColor* top;
+@property (nonatomic, retain) UIColor* right;
+@property (nonatomic, retain) UIColor* bottom;
+@property (nonatomic, retain) UIColor* left;
+@property (nonatomic) CGFloat width;
+ (TTFourBorderStyle*)styleWithTop:(UIColor*)top right:(UIColor*)right bottom:(UIColor*)bottom
left:(UIColor*)left width:(CGFloat)width next:(TTStyle*)next;
@@ -367,10 +367,10 @@
NSInteger _lightSource;
}
-@property(nonatomic,retain) UIColor* highlight;
-@property(nonatomic,retain) UIColor* shadow;
-@property(nonatomic) CGFloat width;
-@property(nonatomic) NSInteger lightSource;
+@property (nonatomic, retain) UIColor* highlight;
+@property (nonatomic, retain) UIColor* shadow;
+@property (nonatomic) CGFloat width;
+@property (nonatomic) NSInteger lightSource;
+ (TTBevelBorderStyle*)styleWithColor:(UIColor*)color width:(CGFloat)width next:(TTStyle*)next;
@@ -389,11 +389,11 @@
CGFloat _width;
}
-@property(nonatomic,retain) UIColor* color1;
-@property(nonatomic,retain) UIColor* color2;
-@property(nonatomic) CGFloat location1;
-@property(nonatomic) CGFloat location2;
-@property(nonatomic) CGFloat width;
+@property (nonatomic, retain) UIColor* color1;
+@property (nonatomic, retain) UIColor* color2;
+@property (nonatomic) CGFloat location1;
+@property (nonatomic) CGFloat location2;
+@property (nonatomic) CGFloat width;
+ (TTLinearGradientBorderStyle*)styleWithColor1:(UIColor*)color1 color2:(UIColor*)color2
width:(CGFloat)width next:(TTStyle*)next;
42 src/Three20/TTStyledFrame.h
View
@@ -24,25 +24,25 @@
CGRect _bounds;
}
-/**
+/**
* The element that contains the frame.
*/
-@property(nonatomic,readonly) TTStyledElement* element;
+@property (nonatomic, readonly) TTStyledElement* element;
/**
* The next in the linked list of frames.
*/
-@property(nonatomic,retain) TTStyledFrame* nextFrame;
+@property (nonatomic, retain) TTStyledFrame* nextFrame;
/**
* The bounds of the content that is displayed by this frame.
*/
-@property(nonatomic) CGRect bounds;
+@property (nonatomic) CGRect bounds;
-@property(nonatomic) CGFloat x;
-@property(nonatomic) CGFloat y;
-@property(nonatomic) CGFloat width;
-@property(nonatomic) CGFloat height;
+@property (nonatomic) CGFloat x;
+@property (nonatomic) CGFloat y;
+@property (nonatomic) CGFloat width;
+@property (nonatomic) CGFloat height;
- (UIFont*)font;
@@ -65,13 +65,13 @@
TTStyle* _style;
}
-@property(nonatomic,assign) TTStyledBoxFrame* parentFrame;
-@property(nonatomic,retain) TTStyledFrame* firstChildFrame;
+@property (nonatomic, assign) TTStyledBoxFrame* parentFrame;
+@property (nonatomic, retain) TTStyledFrame* firstChildFrame;
/**
* The style used to render the frame;
*/
-@property(nonatomic,retain) TTStyle* style;
+@property (nonatomic, retain) TTStyle* style;
@end
@@ -82,9 +82,9 @@
TTStyledInlineFrame* _inlineNextFrame;
}
-@property(nonatomic,readonly) TTStyledInlineFrame* inlineParentFrame;
-@property(nonatomic,assign) TTStyledInlineFrame* inlinePreviousFrame;
-@property(nonatomic,assign) TTStyledInlineFrame* inlineNextFrame;
+@property (nonatomic, readonly) TTStyledInlineFrame* inlineParentFrame;
+@property (nonatomic, assign) TTStyledInlineFrame* inlinePreviousFrame;
+@property (nonatomic, assign) TTStyledInlineFrame* inlineNextFrame;
@end
@@ -96,20 +96,20 @@
UIFont* _font;
}
-/**
+/**
* The node represented by the frame.
*/
-@property(nonatomic,readonly) TTStyledTextNode* node;
+@property (nonatomic, readonly) TTStyledTextNode* node;
/**
* The text that is displayed by this frame.
*/
-@property(nonatomic,readonly) NSString* text;
+@property (nonatomic, readonly) NSString* text;
/**
* The font that is used to measure and display the text of this frame.
*/
-@property(nonatomic,retain) UIFont* font;
+@property (nonatomic, retain) UIFont* font;
- (id)initWithText:(NSString*)text element:(TTStyledElement*)element node:(TTStyledTextNode*)node;
@@ -122,15 +122,15 @@
TTStyle* _style;
}
-/**
+/**
* The node represented by the frame.
*/
-@property(nonatomic,readonly) TTStyledImageNode* imageNode;
+@property (nonatomic, readonly) TTStyledImageNode* imageNode;
/**
* The style used to render the frame;
*/
-@property(nonatomic,retain) TTStyle* style;
+@property (nonatomic, retain) TTStyle* style;
- (id)initWithElement:(TTStyledElement*)element node:(TTStyledImageNode*)node;
10 src/Three20/TTStyledLayout.h
View
@@ -43,11 +43,11 @@
NSMutableArray* _invalidImages;
}
-@property(nonatomic) CGFloat width;
-@property(nonatomic) CGFloat height;
-@property(nonatomic,retain) UIFont* font;
-@property(nonatomic,readonly) TTStyledFrame* rootFrame;
-@property(nonatomic,retain) NSMutableArray* invalidImages;
+@property (nonatomic) CGFloat width;
+@property (nonatomic) CGFloat height;
+@property (nonatomic, retain) UIFont* font;
+@property (nonatomic, readonly) TTStyledFrame* rootFrame;
+@property (nonatomic, retain) NSMutableArray* invalidImages;
- (id)initWithRootNode:(TTStyledNode*)rootNode;
- (id)initWithX:(CGFloat)x width:(CGFloat)width height:(CGFloat)height;
34 src/Three20/TTStyledNode.h
View
@@ -22,10 +22,10 @@
TTStyledNode* _parentNode;
}
-@property(nonatomic, retain) TTStyledNode* nextSibling;
-@property(nonatomic, assign) TTStyledNode* parentNode;
-@property(nonatomic, readonly) NSString* outerText;
-@property(nonatomic, readonly) NSString* outerHTML;
+@property (nonatomic, retain) TTStyledNode* nextSibling;
+@property (nonatomic, assign) TTStyledNode* parentNode;
+@property (nonatomic, readonly) NSString* outerText;
+@property (nonatomic, readonly) NSString* outerHTML;
- (id)initWithNextSibling:(TTStyledNode*)nextSibling;
@@ -41,7 +41,7 @@
NSString* _text;
}
-@property(nonatomic, retain) NSString* text;
+@property (nonatomic, retain) NSString* text;
- (id)initWithText:(NSString*)text;
- (id)initWithText:(NSString*)text next:(TTStyledNode*)nextSibling;
@@ -56,9 +56,9 @@
NSString* _className;
}
-@property(nonatomic, readonly) TTStyledNode* firstChild;
-@property(nonatomic, readonly) TTStyledNode* lastChild;
-@property(nonatomic, retain) NSString* className;
+@property (nonatomic, readonly) TTStyledNode* firstChild;
+@property (nonatomic, readonly) TTStyledNode* lastChild;
+@property (nonatomic, retain) NSString* className;
- (id)initWithText:(NSString*)text;
- (id)initWithText:(NSString*)text next:(TTStyledNode*)nextSibling;
@@ -103,8 +103,8 @@
BOOL _highlighted;
}
-@property(nonatomic) BOOL highlighted;
-@property(nonatomic,retain) NSString* URL;
+@property (nonatomic) BOOL highlighted;
+@property (nonatomic, retain) NSString* URL;
- (id)initWithURL:(NSString*)URL;
- (id)initWithURL:(NSString*)URL next:(TTStyledNode*)nextSibling;
@@ -119,8 +119,8 @@
BOOL _highlighted;
}
-@property(nonatomic) BOOL highlighted;
-@property(nonatomic,retain) NSString* URL;
+@property (nonatomic) BOOL highlighted;
+@property (nonatomic, retain) NSString* URL;
- (id)initWithURL:(NSString*)URL;
- (id)initWithURL:(NSString*)URL next:(TTStyledNode*)nextSibling;
@@ -138,11 +138,11 @@
CGFloat _height;
}
-@property(nonatomic,retain) NSString* URL;
-@property(nonatomic,retain) UIImage* image;
-@property(nonatomic,retain) UIImage* defaultImage;
-@property(nonatomic) CGFloat width;
-@property(nonatomic) CGFloat height;
+@property (nonatomic, retain) NSString* URL;
+@property (nonatomic, retain) UIImage* image;
+@property (nonatomic, retain) UIImage* defaultImage;
+@property (nonatomic) CGFloat width;
+@property (nonatomic) CGFloat height;
- (id)initWithURL:(NSString*)URL;
26 src/Three20/TTStyledText.h
View
@@ -32,44 +32,44 @@
NSMutableArray* _imageRequests;
}
-@property(nonatomic,assign) id<TTStyledTextDelegate> delegate;
+@property (nonatomic, assign) id<TTStyledTextDelegate> delegate;
/**
* The first in the sequence of nodes that contain the styled text.
*/
-@property(nonatomic, retain) TTStyledNode* rootNode;
+@property (nonatomic, retain) TTStyledNode* rootNode;
/**
* The first in the sequence of frames of text calculated by the layout.
*/
-@property(nonatomic, readonly) TTStyledFrame* rootFrame;
+@property (nonatomic, readonly) TTStyledFrame* rootFrame;
/**
* The font that will be used to measure and draw all text.
*/
-@property(nonatomic, retain) UIFont* font;
+@property (nonatomic, retain) UIFont* font;
/**
* The width that the text should be constrained to fit within.
*/
-@property(nonatomic) CGFloat width;
+@property (nonatomic) CGFloat width;
/**
* The height of the text.
*
* The height is automatically calculated based on the width and the size of word-wrapped text.
*/
-@property(nonatomic, readonly) CGFloat height;
+@property (nonatomic, readonly) CGFloat height;
/**
* Indicates if the text needs layout to recalculate its size.
*/
-@property(nonatomic, readonly) BOOL needsLayout;
+@property (nonatomic, readonly) BOOL needsLayout;
/**
- * Images that require loading
+ * Images that require loading
*/
-@property(nonatomic, readonly) NSMutableArray* invalidImages;
+@property (nonatomic, readonly) NSMutableArray* invalidImages;
/**
* Constructs styled text with XHTML tags turned into style nodes.
@@ -85,19 +85,19 @@
* Constructs styled text with all URLs transformed into links.
*
* Only URLs are parsed, not HTML markup. URLs are turned into links.
- */
+ */
+ (TTStyledText*)textWithURLs:(NSString*)source;
+ (TTStyledText*)textWithURLs:(NSString*)source lineBreaks:(BOOL)lineBreaks;
- (id)initWithNode:(TTStyledNode*)rootNode;
/**
- *
+ *
*/
- (void)layoutFrames;
/**
- *
+ *
*/
- (void)layoutIfNeeded;
@@ -106,7 +106,7 @@
*/
- (void)setNeedsLayout;
-/**
+/**
* Draws the text at a point.
*/
- (void)drawAtPoint:(CGPoint)point;
20 src/Three20/TTStyledTextLabel.h
View
@@ -37,48 +37,48 @@
/**
* The styled text displayed by the label.
*/
-@property(nonatomic, retain) TTStyledText* text;
+@property (nonatomic, retain) TTStyledText* text;
/**
* A shortcut for setting the text property to an HTML string.
*/
-@property(nonatomic, copy) NSString* html;
+@property (nonatomic, copy) NSString* html;
/**
* The font of the text.
*/
-@property(nonatomic, retain) UIFont* font;
+@property (nonatomic, retain) UIFont* font;
/**
* The color of the text.
*/
-@property(nonatomic, retain) UIColor* textColor;
+@property (nonatomic, retain) UIColor* textColor;
/**
* The highlight color applied to the text.
*/
-@property(nonatomic, retain) UIColor* highlightedTextColor;
+@property (nonatomic, retain) UIColor* highlightedTextColor;
/**
* The alignment of the text. (NOT YET IMPLEMENTED)
*/
-@property(nonatomic) UITextAlignment textAlignment;
+@property (nonatomic) UITextAlignment textAlignment;
-/**
+/**
* The inset of the edges around the text.
*
* This will increase the size of the label when sizeToFit is called.
*/
-@property(nonatomic) UIEdgeInsets contentInset;
+@property (nonatomic) UIEdgeInsets contentInset;
/**
* A Boolean value indicating whether the receiver should be drawn with a highlight.
*/
-@property(nonatomic) BOOL highlighted;
+@property (nonatomic) BOOL highlighted;
/**
* The link node which is being touched and highlighted by the user.
*/
-@property(nonatomic,retain) TTStyledElement* highlightedNode;
+@property (nonatomic, retain) TTStyledElement* highlightedNode;
@end
6 src/Three20/TTStyledTextParser.h
View
@@ -30,9 +30,9 @@
BOOL _parseURLs;
}
-@property(nonatomic, retain) TTStyledNode* rootNode;
-@property(nonatomic) BOOL parseLineBreaks;
-@property(nonatomic) BOOL parseURLs;
+@property (nonatomic, retain) TTStyledNode* rootNode;
+@property (nonatomic) BOOL parseLineBreaks;
+@property (nonatomic) BOOL parseURLs;
- (void)parseXHTML:(NSString*)html;
- (void)parseText:(NSString*)string;
26 src/Three20/TTTabBar.h
View
@@ -29,13 +29,13 @@
NSMutableArray* _tabViews;
}
-@property(nonatomic,assign) id<TTTabDelegate> delegate;
-@property(nonatomic,retain) NSArray* tabItems;
-@property(nonatomic,readonly) NSArray* tabViews;
-@property(nonatomic,copy) NSString* tabStyle;
-@property(nonatomic,assign) TTTabItem* selectedTabItem;
-@property(nonatomic,assign) TTTab* selectedTabView;
-@property(nonatomic) NSInteger selectedTabIndex;
+@property (nonatomic, assign) id<TTTabDelegate> delegate;
+@property (nonatomic, retain) NSArray* tabItems;
+@property (nonatomic, readonly) NSArray* tabViews;
+@property (nonatomic, copy) NSString* tabStyle;
+@property (nonatomic, assign) TTTabItem* selectedTabItem;
+@property (nonatomic, assign) TTTab* selectedTabView;
+@property (nonatomic) NSInteger selectedTabIndex;
- (id)initWithFrame:(CGRect)frame;
@@ -60,7 +60,7 @@
NSInteger _columnCount;
}
-@property(nonatomic) NSInteger columnCount;
+@property (nonatomic) NSInteger columnCount;
@end
@@ -71,7 +71,7 @@
TTLabel* _badge;
}
-@property(nonatomic,retain) TTTabItem* tabItem;
+@property (nonatomic, retain) TTTabItem* tabItem;
- (id)initWithItem:(TTTabItem*)item tabBar:(TTTabBar*)tabBar;
@@ -87,10 +87,10 @@
TTTabBar* _tabBar;
}
-@property(nonatomic,copy) NSString* title;
-@property(nonatomic,copy) NSString* icon;
-@property(nonatomic,retain) id object;
-@property(nonatomic) int badgeNumber;
+@property (nonatomic, copy) NSString* title;
+@property (nonatomic, copy) NSString* icon;
+@property (nonatomic, retain) id object;
+@property (nonatomic) int badgeNumber;
- (id)initWithTitle:(NSString*)title;
50 src/Three20/TTTableItem.h
View
@@ -24,7 +24,7 @@
id _userInfo;
}
-@property(nonatomic,retain) id userInfo;
+@property (nonatomic, retain) id userInfo;
@end
@@ -33,8 +33,8 @@
NSString* _accessoryURL;
}
-@property(nonatomic,copy) NSString* URL;
-@property(nonatomic,copy) NSString* accessoryURL;
+@property (nonatomic, copy) NSString* URL;
+@property (nonatomic, copy) NSString* accessoryURL;
@end
@@ -42,7 +42,7 @@
NSString* _text;
}
-@property(nonatomic,copy) NSString* text;
+@property (nonatomic, copy) NSString* text;
+ (id)itemWithText:(NSString*)text;
+ (id)itemWithText:(NSString*)text URL:(NSString*)URL;
@@ -54,7 +54,7 @@
NSString* _caption;
}
-@property(nonatomic,copy) NSString* caption;
+@property (nonatomic, copy) NSString* caption;
+ (id)itemWithText:(NSString*)text caption:(NSString*)caption;
+ (id)itemWithText:(NSString*)text caption:(NSString*)caption URL:(NSString*)URL;
@@ -75,9 +75,9 @@
UIImage* _defaultImage;
}
-@property(nonatomic,copy) NSString* subtitle;
-@property(nonatomic,copy) NSString* imageURL;
-@property(nonatomic,retain) UIImage* defaultImage;
+@property (nonatomic, copy) NSString* subtitle;
+@property (nonatomic, copy) NSString* imageURL;
+@property (nonatomic, retain) UIImage* defaultImage;
+ (id)itemWithText:(NSString*)text subtitle:(NSString*)subtitle;
+ (id)itemWithText:(NSString*)text subtitle:(NSString*)subtitle URL:(NSString*)URL;
@@ -97,10 +97,10 @@
NSString* _imageURL;
}
-@property(nonatomic,copy) NSString* title;
-@property(nonatomic,copy) NSString* caption;
-@property(nonatomic,retain) NSDate* timestamp;
-@property(nonatomic,copy) NSString* imageURL;
+@property (nonatomic, copy) NSString* title;
+@property (nonatomic, copy) NSString* caption;
+@property (nonatomic, retain) NSDate* timestamp;
+@property (nonatomic, copy) NSString* imageURL;
+ (id)itemWithTitle:(NSString*)title caption:(NSString*)caption text:(NSString*)text
timestamp:(NSDate*)timestamp URL:(NSString*)URL;
@@ -129,8 +129,8 @@
id<TTModel> _model;
}
-@property(nonatomic) BOOL isLoading;
-@property(nonatomic,retain) id<TTModel> model;
+@property (nonatomic) BOOL isLoading;
+@property (nonatomic, retain) id<TTModel> model;
@end
@@ -140,9 +140,9 @@
TTStyle* _imageStyle;
}
-@property(nonatomic,copy) NSString* imageURL;
-@property(nonatomic,retain) UIImage* defaultImage;
-@property(nonatomic,retain) TTStyle* imageStyle;
+@property (nonatomic, copy) NSString* imageURL;
+@property (nonatomic, retain) UIImage* defaultImage;
+@property (nonatomic, retain) TTStyle* imageStyle;
+ (id)itemWithText:(NSString*)text imageURL:(NSString*)imageURL;
+ (id)itemWithText:(NSString*)text imageURL:(NSString*)imageURL URL:(NSString*)URL;
@@ -160,7 +160,7 @@
NSString* _text;
}