Changeset 623

Timestamp:

01/11/10 10:26:27 (2 months ago)

Author:

henri

Message:

Changed groups management UI to conform to new standard

Location:

apps/iphone/my.tel/trunk/Classes

Files:

• GroupFriendsController.m (modified) (1 diff)
• GroupsViewController.h (modified) (2 diffs)
• GroupsViewController.m (modified) (6 diffs)

apps/iphone/my.tel/trunk/Classes/GroupFriendsController.m

@@ -56 +56 @@
 
 - (void)deleteGroup {
-        Group *conn = [[[Group alloc] init] autorelease];
-        [conn setTheDelegate:self];
-        [conn setActionSel:@selector(groupDeletedWithJson:)];
-        [conn setConnectionUrl:[conn urlFromAction:@"deletegroup"]];
-        
-        NSMutableDictionary *requestData = [[NSMutableDictionary dictionaryWithCapacity:2] retain];
-        [requestData setObject:[self.delegate domain] forKey:@"domainName"];
-        [requestData setObject:[theGroup objectForKey:@"id"] forKey:@"groupId"];
-        
-        [conn setPayload:requestData];
-        NSDictionary *parsedJson = [conn performLookup:FALSE];
-        [requestData release];
-        if ([[parsedJson valueForKey:@"success"] integerValue] == 1) {
-                [self.delegate dataDidChangeInController:self];
-                [self.navigationController popViewControllerAnimated:YES];
-        } else {
-                [Group throwJsonErrorAlert:parsedJson];
-        }
+        [self.delegate objectWillGetDeletedInController:self];
+        [self.navigationController popViewControllerAnimated:YES];
 }
 

apps/iphone/my.tel/trunk/Classes/GroupsViewController.h

@@ -16 +16 @@
 <UITableViewDelegate, UITableViewDataSource, UIAlertViewDelegate, TelControllerDelegate> {
         NSMutableArray *groupsArray;    // retrieved raw JSON data (also used as the datasource array)
+        NSUInteger currentGroupIndex;   // groupsArray index of the group being edited or viewed
         id <TelControllerDelegate> delegate;
 @private
@@ -26 +27 @@
 - (void)listGroups;
 - (void)createGroup:(NSString *)aGroupName;
-
+- (void)deleteGroupAtIndex:(NSUInteger)index;
 
 - (IBAction)didClickAdd:(id)sender;

apps/iphone/my.tel/trunk/Classes/GroupsViewController.m

@@ -43 +43 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
-        self.navigationItem.rightBarButtonItem = [[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAdd
-                                                                                                                                                                                        target:self
-                                                                                                                                                                                        action:@selector(didClickAdd:)]
-                                                                                          autorelease];
+        self.navigationItem.rightBarButtonItem = [self editButtonItem];
+        // disable editing until we've loaded the data
+        self.navigationItem.rightBarButtonItem.enabled = NO;
         self.title = @"Privacy Groups";
 }
@@ -88 +87 @@
 - (UITableViewCellEditingStyle)tableView:(UITableView *)tableView
                    editingStyleForRowAtIndexPath:(NSIndexPath *)indexPath {
+        NSDictionary *sGroup = [groupsArray objectAtIndex:indexPath.row];
+        if ([[sGroup valueForKey:@"allFriends"] integerValue] == 1) {
+                return UITableViewCellEditingStyleNone;
+        }
         return UITableViewCellEditingStyleDelete;
 }
 
 - (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
-        // Don't allow deleting here, do it in the navigation pane of the individual group
-        return FALSE;
+        // Disable swipe-to-delete: don't allow row edit if table not in edit mode
+        return (tableView.editing);
+}
+
+- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle
+forRowAtIndexPath:(NSIndexPath *)indexPath {
+        if (editingStyle == UITableViewCellEditingStyleDelete) {
+                [self deleteGroupAtIndex:indexPath.row];
+        }               
 }
 
@@ -119 +129 @@
                 cell.textLabel.text = [sGroup valueForKey:@"name"];
         }
+        [cell.textLabel setNeedsDisplay];
     return cell;
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+        [tableView deselectRowAtIndexPath:indexPath animated:YES];
+        currentGroupIndex = indexPath.row;
         GroupFriendsController *newController = [GroupFriendsController 
                                                                                          controllerForGroup:[groupsArray objectAtIndex:indexPath.row] delegate:self];
-        [tableView deselectRowAtIndexPath:indexPath animated:YES];
         [[self navigationController] pushViewController:newController animated:YES];
 }
+
+- (void)setEditing:(BOOL)editing animated:(BOOL)animated {
+        [super setEditing:editing animated:animated];
+        if (editing) {
+                self.navigationItem.leftBarButtonItem = [[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAdd
+                                                                                                                                                                                           target:self
+                                                                                                                                                                                           action:@selector(didClickAdd:)] autorelease];
+        } else {
+                self.navigationItem.leftBarButtonItem = nil;
+        }
+}
+
 
 #pragma mark ------ UI Methods and JSON delegates
@@ -141 +165 @@
         alert.uiStringField.text = @"";
         [alert show];
+}
+
+- (void)deleteGroupAtIndex:(NSUInteger)index {
+        NSDictionary *aGroup = [groupsArray objectAtIndex:index]; 
+        if (!aGroup) {
+                return;
+        }
+        [aGroup retain];
+        Group *conn = [[[Group alloc] init] autorelease];
+        [conn setTheDelegate:self];
+        [conn setActionSel:@selector(groupDeletedWithJson:)];
+        [conn setConnectionUrl:[conn urlFromAction:@"deletegroup"]];
+        
+        NSMutableDictionary *requestData = [[NSMutableDictionary dictionaryWithCapacity:2] retain];
+        [requestData setObject:[self.delegate domain] forKey:@"domainName"];
+        [requestData setObject:[aGroup objectForKey:@"id"] forKey:@"groupId"];
+        
+        [conn setPayload:requestData];
+        NSDictionary *parsedJson = [conn performLookup:FALSE];
+        [requestData release];
+        if ([[parsedJson valueForKey:@"success"] integerValue] == 0) {
+                [Group throwJsonErrorAlert:parsedJson];
+        } else {
+                [self.groupsArray removeObjectAtIndex:index];
+                NSIndexPath *deleteIndexPath = [NSIndexPath indexPathForRow:index inSection:0];
+        [self.tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:deleteIndexPath] withRowAnimation:UITableViewRowAnimationFade];
+        }
 }
 
@@ -169 +220 @@
                 [self.delegate dataDidChangeInController:self];
                 [self.tableView reloadData];
+                self.navigationItem.rightBarButtonItem.enabled = YES;
         } else {
                 [self.tableView reloadData];
@@ -186 +238 @@
         // request the domain from the calling controller
         return [self.delegate domain];
+}
+
+- (void)objectWillGetDeletedInController:(UIViewController *)controller {
+        if ([controller isMemberOfClass:[GroupFriendsController class]]) {
+                [self deleteGroupAtIndex:currentGroupIndex];
+        }
 }