diff --git a/FPPopoverDemo/DemoTableController.h b/FPPopoverDemo/DemoTableController.h index bedf5b4..f994b8f 100644 --- a/FPPopoverDemo/DemoTableController.h +++ b/FPPopoverDemo/DemoTableController.h @@ -8,8 +8,17 @@ #import -@class FPViewController; +@class DemoTableController; + +@protocol DemoTableViewControllerDelegate + +- (void)DemoTableControllerDidFinish:(DemoTableController *)controller selectedValue:(NSString *)textSelected; + +@end + @interface DemoTableController : UITableViewController -@property(nonatomic,assign) FPViewController *delegate; + +@property(weak,nonatomic) id delegate; + @end diff --git a/FPPopoverDemo/DemoTableController.m b/FPPopoverDemo/DemoTableController.m index bd478a0..22fe9c6 100644 --- a/FPPopoverDemo/DemoTableController.m +++ b/FPPopoverDemo/DemoTableController.m @@ -55,13 +55,13 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N #pragma mark - Table view delegate -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - if([self.delegate respondsToSelector:@selector(selectedTableRow:)]) - { - [self.delegate selectedTableRow:indexPath.row]; - } + + [self.delegate DemoTableControllerDidFinish:self selectedValue:[NSString stringWithFormat:@"cell %d",indexPath.row]]; + } + @end diff --git a/FPPopoverDemo/FPDemoTableViewController.h b/FPPopoverDemo/FPDemoTableViewController.h index 40153f6..8fb2a8b 100644 --- a/FPPopoverDemo/FPDemoTableViewController.h +++ b/FPPopoverDemo/FPDemoTableViewController.h @@ -7,7 +7,9 @@ // #import +#import "DemoTableController.h" -@interface FPDemoTableViewController : UITableViewController + +@interface FPDemoTableViewController : UITableViewController @end diff --git a/FPPopoverDemo/FPDemoTableViewController.m b/FPPopoverDemo/FPDemoTableViewController.m index af599a7..a5e7ffd 100644 --- a/FPPopoverDemo/FPDemoTableViewController.m +++ b/FPPopoverDemo/FPDemoTableViewController.m @@ -14,7 +14,11 @@ @interface FPDemoTableViewController () @end -@implementation FPDemoTableViewController +@implementation FPDemoTableViewController { + + FPPopoverController *popover; + +} - (id)initWithStyle:(UITableViewStyle)style { @@ -61,7 +65,7 @@ -(void)popover:(id)sender //the controller we want to present as a popover DemoTableController *controller = [[DemoTableController alloc] initWithStyle:UITableViewStylePlain]; - FPPopoverController *popover = [[FPPopoverController alloc] initWithViewController:controller]; + popover = [[FPPopoverController alloc] initWithViewController:controller]; //popover.arrowDirection = FPPopoverArrowDirectionAny; popover.tint = FPPopoverDefaultTint; @@ -118,6 +122,14 @@ - (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *) } */ +- (void)DemoTableControllerDidFinish:(DemoTableController *)controller selectedField:(NSString *)textSelected { + + [popover dismissPopoverAnimated:YES]; + + NSLog(@"textSelected %@",textSelected); + +} +