From 4de6475036a07b7abbec0f83b427f177897d3a18 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 18 Jun 2014 17:33:06 +0300 Subject: [PATCH 1/5] + methods - add tag/tags --- AMTagListView/AMTagListView.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/AMTagListView/AMTagListView.h b/AMTagListView/AMTagListView.h index c902f7c..bdae36d 100644 --- a/AMTagListView/AMTagListView.h +++ b/AMTagListView/AMTagListView.h @@ -27,6 +27,10 @@ typedef void (^AMTagListViewTapHandler)(AMTagView*); */ - (void)addTag:(NSString*)text; +- (void)addTagIndex:(NSInteger)index; + +- (void)addTags:(NSArray*)array setIndexs:(NSArray *)indexs; + /** Add a multiple tags * * Adds multiple tags to the scroll view. From 0f26d6591ad15b2934c1e8a4d5def988bf68a5d4 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 18 Jun 2014 17:33:11 +0300 Subject: [PATCH 2/5] + init tag methods --- AMTagListView/AMTagListView.m | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/AMTagListView/AMTagListView.m b/AMTagListView/AMTagListView.m index f1934a3..00ac864 100644 --- a/AMTagListView/AMTagListView.m +++ b/AMTagListView/AMTagListView.m @@ -14,6 +14,8 @@ @interface AMTagListView () @property (nonatomic, strong) id orientationNotification; @property (nonatomic, strong) id tagNotification; +@property (nonatomic) NSInteger tagIndex; + @end @implementation AMTagListView @@ -61,6 +63,10 @@ - (void)setTapHandler:(AMTagListViewTapHandler)tapHandler _tapHandler = tapHandler; } +- (void)addTagIndex:(NSInteger)index { + _tagIndex = index; +} + - (void)addTag:(NSString*)text { UIFont* font = [[AMTagView appearance] textFont] ? [[AMTagView appearance] textFont] : kDefaultFont; @@ -74,6 +80,7 @@ - (void)addTag:(NSString*)text AMTagView* tagView = [[AMTagView alloc] initWithFrame:(CGRect){0, 0, size.width, size.height}]; [tagView setupWithText:text]; + [tagView setTag:_tagIndex]; [self.tags addObject:tagView]; [self rearrangeTags]; @@ -91,6 +98,7 @@ - (void)addTagView:(AMTagView *)tagView size.width = MIN(size.width, self.frame.size.width - self.marginX * 2); tagView.frame = (CGRect){0, 0, size.width, size.height}; + [tagView setTag:_tagIndex]; [self.tags addObject:tagView]; [self rearrangeTags]; @@ -132,6 +140,9 @@ - (void)rearrangeTags [self setContentSize:(CGSize){self.frame.size.width, maxY + size.height +self.marginY}]; } +- (void)addTags:(NSArray*)array setIndexs:(NSArray *)indexs { +} + - (void)addTags:(NSArray*)array { for (NSString* text in array) { From fae9ec16896614242499893a1dea9798263e9fba Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 18 Jun 2014 17:45:17 +0300 Subject: [PATCH 3/5] + add comments methods --- AMTagListView/AMTagListView.h | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/AMTagListView/AMTagListView.h b/AMTagListView/AMTagListView.h index bdae36d..ab43397 100644 --- a/AMTagListView/AMTagListView.h +++ b/AMTagListView/AMTagListView.h @@ -19,6 +19,14 @@ typedef void (^AMTagListViewTapHandler)(AMTagView*); * ----------------------------------------------------------------------------- */ + +/** +* Add tag index +* +* @param index - Tag index +*/ +- (void)addTagIndex:(NSInteger)index; + /** Add a new tag * * Adds a new tag to the scroll view. @@ -27,10 +35,6 @@ typedef void (^AMTagListViewTapHandler)(AMTagView*); */ - (void)addTag:(NSString*)text; -- (void)addTagIndex:(NSInteger)index; - -- (void)addTags:(NSArray*)array setIndexs:(NSArray *)indexs; - /** Add a multiple tags * * Adds multiple tags to the scroll view. @@ -39,6 +43,14 @@ typedef void (^AMTagListViewTapHandler)(AMTagView*); */ - (void)addTags:(NSArray*)array; +/** + * Add a multiple tags and indexs + * + * @param array - array An array of strings + * @param indexs - array tags index + */ +- (void)addTags:(NSArray*)array setIndexs:(NSArray *)indexs; + /** Add a specific tag to the tag scroll view * * @param tagView An AMTagView instance From 0b01a6eac75dcab7bb6f4322e8bc0d983658267c Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 18 Jun 2014 17:45:35 +0300 Subject: [PATCH 4/5] + more tags and index --- AMTagListView/AMTagListView.m | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/AMTagListView/AMTagListView.m b/AMTagListView/AMTagListView.m index 00ac864..4480edd 100644 --- a/AMTagListView/AMTagListView.m +++ b/AMTagListView/AMTagListView.m @@ -141,6 +141,10 @@ - (void)rearrangeTags } - (void)addTags:(NSArray*)array setIndexs:(NSArray *)indexs { + [indexs enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) { + _tagIndex = [obj integerValue]; + [self addTag:[array objectAtIndex:idx]]; + }]; } - (void)addTags:(NSArray*)array From e673e813f05e71a71fec2715f1a2ad2086f8efd1 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 18 Jun 2014 17:46:26 +0300 Subject: [PATCH 5/5] update example --- TagListViewDemo/TagListViewDemo/AMViewController.m | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/TagListViewDemo/TagListViewDemo/AMViewController.m b/TagListViewDemo/TagListViewDemo/AMViewController.m index d2f5eae..45789be 100644 --- a/TagListViewDemo/TagListViewDemo/AMViewController.m +++ b/TagListViewDemo/TagListViewDemo/AMViewController.m @@ -40,9 +40,13 @@ - (void)viewDidLoad [self.tagListView addTag:@"something"]; [self.tagListView addTag:@"long tag is long"]; [self.tagListView addTag:@"hi there"]; + +// [[self tagListView] addTags:@[@"Hello", @"Hello people", @"Good"] setIndexs:@[@100, @200, @300]]; __weak AMViewController* weakSelf = self; [self.tagListView setTapHandler:^(AMTagView *view) { +// NSLog(@"%@", [view tagText]); +// NSLog(@"%d", view.tag); weakSelf.selection = view; UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Delete" message:[NSString stringWithFormat:@"Delete %@?", [view tagText]]