Changeset 634

Timestamp:

01/11/10 21:40:07 (2 months ago)

Author:

henri

Message:

Further improvements to Keyword editing

Location:

apps/iphone/my.tel/trunk/Classes

Files:

• HATypePickerController.h (modified) (1 diff)
• HATypePickerController.m (modified) (2 diffs)
• KeywordEditController.h (modified) (1 diff)
• KeywordEditController.m (modified) (4 diffs)
• KeywordViewController.m (modified) (3 diffs)

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

@@ -27 +27 @@
 - (void)presentViewController;
 - (void)dismissViewController;
+- (void)selectRowWithString:(NSString *)aString inComponent:(NSInteger)aComponent animated:(BOOL)animated;
 - (IBAction)didCancelPicker:(id)sender;
 - (IBAction)didAcceptPicker:(id)sender;
 
 @property (nonatomic, retain) IBOutlet UIPickerView *picker;
-@property (nonatomic,assign) id <HATypePickerViewDelegate> delegate;
+@property (nonatomic, assign) id <HATypePickerViewDelegate> delegate;
 @end

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

@@ -15 +15 @@
 @dynamic delegate;
 
+- (void)viewDidLoad {
+        [super viewDidLoad];
+        self.delegate = delegate;
+}
+
 - (void)presentViewController {
         UIWindow *win = [UIApplication sharedApplication].keyWindow;
@@ -30 +35 @@
         if (self.view.window) {
                 [self.view removeFromSuperview];
-                CATransition *animation = [CATransition animation];
-                [animation setDelegate:self];
-                [animation setType:kCATransitionMoveIn];
-                [animation setSubtype:kCATransitionFromBottom];
-                [animation setDuration:0.5f];
-                [animation setTimingFunction:[CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]];
-                [[self.view.window layer] addAnimation:animation forKey:@"kEditAnimation"];
         }
 }
 
-- (void)viewDidLoad {
-        [super viewDidLoad];
-        self.delegate = delegate;
+- (void)selectRowWithString:(NSString *)aString inComponent:(NSInteger)aComponent animated:(BOOL)animated {
+        NSInteger numRows = [picker numberOfRowsInComponent:aComponent];
+        for (NSInteger i=0; i<numRows; i++) {
+                if ([[picker.delegate pickerView:picker titleForRow:i forComponent:aComponent] isEqualToString:aString]) {
+                        [picker selectRow:i inComponent:aComponent animated:animated];
+                        return;
+                }
+        }
 }
 

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

@@ -44 +44 @@
         BOOL isEditing;
         NSInteger rowBeingEdited;
+        HATypePickerController *typePickerController;
 }
 

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

@@ -50 +50 @@
         [buttonSave retain];
         self.navigationItem.rightBarButtonItem = buttonSave;
+        typePickerController = [[HATypePickerController alloc] initWithNibName:@"HATypePickerController"
+                                                                                                                                        bundle:nil];
         return self;
 }
@@ -72 +74 @@
 - (void)dealloc {
         [buttonSave release];
+        [typePickerController release];
     [super dealloc];
 }
@@ -232 +235 @@
 
         if (indexPath.section == kKKeywordEditTableViewSectionType) {
-                HATypePickerController *typePickerController = [[[HATypePickerController alloc] initWithNibName:@"HATypePickerController"
-                                                                                                                                                                                                 bundle:nil] autorelease];
                 typePickerController.delegate = self;
                 [typePickerController presentViewController];
+                [typePickerController selectRowWithString:[delegate longNameForKeyword:self.primaryType]
+                                                                          inComponent:0
+                                                                                 animated:0];
         } else if (indexPath.section == kKKeywordEditTableViewSectionValue) {
                 NSString *tvEditTitle = [delegate longNameForKeyword:self.primaryType];         
@@ -319 +323 @@
                 [JsonConnection throwJsonErrorAlert:parsedJson];
         }
+        [self.delegate dataDidChangeInController:self];
 }
 

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

@@ -57 +57 @@
         keywordTableHeight = kKRowHeight;
         self.title = @"Keywords";
-}
-
-- (void)viewWillAppear:(BOOL)animated {
-        [super viewWillAppear:animated];
         // Don't get the data if we preloaded
         if (didPreload) {
@@ -68 +64 @@
                 [self getKeywords];
         }
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+        [super viewWillAppear:animated];
 }
 
@@ -170 +170 @@
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
         CGFloat rowSize = 30;   // title + borders
-        CGSize constrainedSize = CGSizeMake([UIScreen mainScreen].bounds.size.width - 50, 200);
+        CGSize constrainedSize = CGSizeMake([UIScreen mainScreen].bounds.size.width - 50, 400);
         NSDictionary *uiItem = [[uiArray objectAtIndex:indexPath.row] retain];
         NSString *primaryValue = [uiItem objectForKey:@"value"];