diff --git a/Files/AlbumViewController.m b/Files/AlbumViewController.m index f9178a5..52a0c6e 100755 --- a/Files/AlbumViewController.m +++ b/Files/AlbumViewController.m @@ -156,7 +156,7 @@ - (IBAction)cameraButtonTapped:(id)sender imagePicker.delegate = self; // Show image picker - [self presentModalViewController:imagePicker animated:YES]; + [self presentViewController:imagePicker animated:YES completion:nil]; } else{ // Device has no camera diff --git a/Files/AnimalAddPostView.m b/Files/AnimalAddPostView.m index 725080b..0a110c4 100644 --- a/Files/AnimalAddPostView.m +++ b/Files/AnimalAddPostView.m @@ -100,6 +100,9 @@ -(void)notifEditingEnd{ } + + + -(void)sendPost{ if (![self verifyPost]) { UIAlertView *alert = [[UIAlertView alloc] initWithTitle:[Helper languageSelectedStringForKey:@"Post Attantion"] diff --git a/Files/AnimalDataNewViewController.h b/Files/AnimalDataNewViewController.h new file mode 100644 index 0000000..ba7ea08 --- /dev/null +++ b/Files/AnimalDataNewViewController.h @@ -0,0 +1,59 @@ +// +// AnimalDataNewViewController.h +// JerusalemBiblicalZoo +// +// Created by shani hajbi on 5/10/14. +// +// + +#import +#import "Animal.h" + +typedef NS_ENUM(NSInteger, AnmialDataSections) { + AnmialDataSectionImagesScroll, + AnmialDataSectionData, + AnmialDataSectionQuestions, + AnmialDataSectionPhotos, + AnmialDataSectionPosts, +}; + +typedef NS_ENUM(NSInteger, AnmialDataCells) { + AnmialDataCellShorts, + AnmialDataCellFullData, +}; + +typedef NS_ENUM(NSInteger, AnmialQuestionsCells) { + AnmialQuestionsCellLastestQuestion, + AnmialQuestionsCellSendQuestion, +}; + +typedef NS_ENUM(NSInteger, AnmialPostsCells) { + AnmialPostsCellLastestPost, + AnmialPostsCellSendPost, +}; + +typedef NS_ENUM(NSInteger, AnmialPhotosCells) { + AnmialPhotosCellsLatestImage, + AnmialPhotosCellsSendImage, +}; + +@interface AnimalDataNewViewController : UITableViewController +@property (weak, nonatomic) IBOutlet UIView *headerView; +@property (nonatomic, strong) Animal *animal; + +@property (strong, nonatomic) IBOutletCollection(UIView) NSArray *conservationViews; + + +@property (weak, nonatomic) IBOutlet UIView *imagesScrollViewContainer; + +@property (weak, nonatomic) IBOutlet UILabel *latestQuestionLabel; +@property (weak, nonatomic) IBOutlet UILabel *latestQuestionUserNameLabel; + +@property (weak, nonatomic) IBOutlet PFImageView *latestImageImageView; +@property (weak, nonatomic) IBOutlet UILabel *latestImageUserNameLabel; + +@property (weak, nonatomic) IBOutlet UILabel *latestPostUserNameLabel; +@property (weak, nonatomic) IBOutlet UILabel *latestPostLabel; + +- (IBAction)dissmisModalViewController:(id)sender; +@end diff --git a/Files/AnimalDataNewViewController.m b/Files/AnimalDataNewViewController.m new file mode 100644 index 0000000..ae6378b --- /dev/null +++ b/Files/AnimalDataNewViewController.m @@ -0,0 +1,318 @@ +// +// AnimalDataNewViewController.m +// JerusalemBiblicalZoo +// +// Created by shani hajbi on 5/10/14. +// +// + +#import "AnimalDataNewViewController.h" +#import "AnimalsImagesScrollView.h" +#import "AnimalDescriptionWebView.h" +#import "SendPostOrQuestionViewController.h" +#import "ViewQuestionsOrPostsViewController.h" + +@interface AnimalDataNewViewController () + +@end + +@implementation AnimalDataNewViewController + +- (void)awakeFromNib +{ + +} + + + +- (void)viewDidLoad +{ + [super viewDidLoad]; + self.tableView.tableHeaderView.hidden = YES; + [self setUpConservationStatus]; + [self setUpScrollViewImages]; + [self setUpLatestPost]; + [self setUpLatestQuestion]; + [self setUpLatestUserImage]; +} + +- (UIBarButtonItem *)cancelBarButton +{ + return [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(dismissModalViewControllerAnimated:)]; +} + +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender +{ + if ([segue.identifier isEqualToString:@"animalDescriptionSegue"]) { + AnimalDescriptionWebView *webViewController = (AnimalDescriptionWebView *)segue.destinationViewController; + webViewController.animal = self.animal; + } + else if ([segue.identifier isEqualToString:@"PostQuestion"] || [segue.identifier isEqualToString:@"PostPost"]) + { + UINavigationController *navController = (UINavigationController *) segue.destinationViewController; + SendPostOrQuestionViewController *destController = (SendPostOrQuestionViewController *) navController.viewControllers[0]; + destController.navigationItem.leftBarButtonItem = [self cancelBarButton]; + destController.animal = self.animal; + if ([segue.identifier isEqualToString:@"PostQuestion"]) + { + destController.postType = PostTypeQuestion; + } + else + { + destController.postType = PostTypePost; + + } + } + else if ([segue.identifier isEqualToString:@"ViewAnimalQuestions"] || [segue.identifier isEqualToString:@"ViewAnimalPosts"]) + { + ViewQuestionsOrPostsViewController *postsViewer = (ViewQuestionsOrPostsViewController *)segue.destinationViewController; + postsViewer.className = @"AnimalQuestions"; + postsViewer.pullToRefreshEnabled = NO; + postsViewer.loadingViewEnabled = NO; + postsViewer.paginationEnabled = YES; + postsViewer.objectsPerPage = 15; + postsViewer.animal = self.animal; + if ([segue.identifier isEqualToString:@"ViewAnimalPosts"]) + { + postsViewer.postType = ViewerPostTypePost; + } + else + { + postsViewer.postType = ViewerPostTypeQuestion; + } + } + +} + +- (void)setUpConservationStatus +{ + for (UIView *conservationView in self.conservationViews) { + conservationView.layer.cornerRadius = 20.0f; + conservationView.layer.borderColor = [Helper colorForConservationStatus:conservationView.tag].CGColor; + conservationView.layer.borderWidth = 1.0; + for (UILabel *label in conservationView.subviews) { + if ([label isKindOfClass:[UILabel class]]) { + label.textColor = [Helper textColorForConservationStatus:conservationView.tag]; + } + } + } +} + +- (void)setUpLatestPost +{ + PFQuery *query = [PFQuery queryWithClassName:@"AnimalPost"]; + //[query whereKey:@"objectId" equalTo:self.animal.objectId]; + [query getFirstObjectInBackgroundWithBlock:^(PFObject *object, NSError *error) { + if (!object) { + NSString *placeHolderString = [NSString stringWithFormat:@"Be the first to ask a post about %@",self.animal.name]; + self.latestPostLabel.text = placeHolderString; + self.latestPostUserNameLabel.text = @""; + NSLog(@"The getFirstObject request failed."); + } else { + // The find succeeded. + NSLog(@"Successfully retrieved the object."); + self.latestPostLabel.text = object[@"text"]; + self.latestPostUserNameLabel.text = object[@"user"]; + } + }]; + NSString *placeHolderString = [NSString stringWithFormat:@"Be the first to ask a post about %@",self.animal.name]; + self.latestPostLabel.text = placeHolderString; + self.latestPostUserNameLabel.text = @""; +} + +- (void)setUpLatestQuestion +{ + PFQuery *query = [PFQuery queryWithClassName:@"AnimalQuestions"]; + query.cachePolicy = kPFCachePolicyCacheElseNetwork; + //[query whereKey:@"objectId" equalTo:self.animal.objectId]; + [query getFirstObjectInBackgroundWithBlock:^(PFObject *object, NSError *error) { + if (!object) { + NSLog(@"The getFirstObject request failed."); + NSString *placeHolderString = [NSString stringWithFormat:@"Be the first to ask a question about %@",self.animal.name]; + self.latestQuestionLabel.text = placeHolderString; + self.latestQuestionUserNameLabel.text = @""; + } else { + // The find succeeded. + NSLog(@"Successfully retrieved the object."); + self.latestQuestionLabel.text = object[@"question_en"]; + self.latestQuestionUserNameLabel.text = object[@"user_name"]; + } + }]; + + NSString *placeHolderString = [NSString stringWithFormat:@"Be the first to ask a question about %@",self.animal.name]; + self.latestQuestionLabel.text = placeHolderString; + self.latestQuestionUserNameLabel.text = @""; +} + +- (void)setUpLatestUserImage +{ + PFQuery *query = [PFQuery queryWithClassName:@"UserPhoto"]; + query.cachePolicy = kPFCachePolicyCacheElseNetwork; + + //[query whereKey:@"objectId" equalTo:self.animal.objectId]; + [query getFirstObjectInBackgroundWithBlock:^(PFObject *object, NSError *error) { + if (!object) { + NSLog(@"The getFirstObject request failed."); + } else { + // The find succeeded. + NSLog(@"Successfully retrieved the object."); + self.latestImageImageView.image = [UIImage imageNamed:@""]; // placeholder image + self.latestImageImageView.file = (PFFile *)object[@"imageFile"]; // remote image + [self.latestImageImageView loadInBackground]; + } + }]; +} + + + +- (void)setUpScrollViewImages +{ + AnimalsImagesScrollView *imagesScrollView = [[AnimalsImagesScrollView alloc] initWithFrame:CGRectMake(0, 0, 320, 190) withAnimal:self.animal]; + [self.imagesScrollViewContainer addSubview:imagesScrollView]; +} + +- (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath +{ + +} + +- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath +{ + switch (indexPath.section) { + case AnmialDataSectionData: + + + break; + case AnmialDataSectionQuestions: + if (indexPath.row == AnmialQuestionsCellSendQuestion) + { + [self sendQuestion]; + } + break; + case AnmialDataSectionPhotos: + if (indexPath.row == AnmialPhotosCellsSendImage) + { + [self takeAnimalPicture]; + } + break; + case AnmialDataSectionPosts: + if (indexPath.row == AnmialQuestionsCellSendQuestion) + { + [self sendQuestion]; + } + break; + break; + + default: + break; + } +} + + + + +#pragma mark take photo + +- (void)takeAnimalPicture +{ + // does the device have a camera? + if ([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) + { + RIButtonItem *selectPhotoButton = [RIButtonItem itemWithLabel:NSLocalizedString(@"Choose from library",nil) action:^{ + [self selectPhoto]; + }]; + RIButtonItem *takePhotoButton = [RIButtonItem itemWithLabel:NSLocalizedString(@"Take a photo",nil) action:^{ + [self takePhoto]; + }]; + UIActionSheet *ac = [[UIActionSheet alloc] initWithTitle:NSLocalizedString(@"Image source",nil) cancelButtonItem:[RIButtonItem itemWithLabel:NSLocalizedString(@"Cancel",nil)] destructiveButtonItem:nil otherButtonItems:takePhotoButton,selectPhotoButton, nil]; + [ac showInView:self.view]; + } + else + { + [self selectPhoto]; + } +} + +- (void)takePhoto{ + + UIImagePickerController *picker = [[UIImagePickerController alloc] init]; + picker.delegate = self; + picker.allowsEditing = YES; + picker.sourceType = UIImagePickerControllerSourceTypeCamera; + picker.cameraDevice = UIImagePickerControllerCameraDeviceFront; + [self presentViewController:picker animated:YES completion:NULL]; +} + +- (void)selectPhoto { + + UIImagePickerController *picker = [[UIImagePickerController alloc] init]; + picker.delegate = self; + picker.allowsEditing = YES; + picker.sourceType = UIImagePickerControllerSourceTypePhotoLibrary; + + [self presentViewController:picker animated:YES completion:NULL]; +} + +- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info { + + UIImage *image = info[UIImagePickerControllerOriginalImage]; + UIImage *scaledImage = [self imageWithImage:image scaledToSize:CGSizeMake(320, 190)]; + NSData *dataForJPEGFile = UIImageJPEGRepresentation(scaledImage, 0.6); + self.latestImageImageView.image = scaledImage; + PFFile *imageFile = [PFFile fileWithName:[NSString stringWithFormat:@"%@.jpg",self.animal.nameEn] data:dataForJPEGFile]; + [imageFile saveInBackgroundWithBlock:^(BOOL succeeded, NSError *error) { + NSLog(@"uploaded"); + + PFObject *userPhoto = [PFObject objectWithClassName:@"VisitorsPhotos"]; + //PFObject *animal = [PFObject objectWithoutDataWithClassName:animal objectId:<#(NSString *)#> + // userPhoto[@"animal"] = self.animal.objectId; + [userPhoto setObject:imageFile forKey:@"image"]; + + [userPhoto saveInBackgroundWithBlock:^(BOOL succeeded, NSError *error) { + if (!error) { + //[self refresh:nil]; + } + else{ + // Log details of the failure + } + }]; + } progressBlock:^(int percentDone) { + NSLog(@"uploading %i",percentDone); + // Update your progress spinner here. percentDone will be between 0 and 100. + }]; + [picker dismissViewControllerAnimated:YES completion:NULL]; + +} + +- (UIImage*)imageWithImage:(UIImage*)image + scaledToSize:(CGSize)newSize; +{ + UIGraphicsBeginImageContext( newSize ); + [image drawInRect:CGRectMake(0,0,newSize.width,newSize.height)]; + UIImage* newImage = UIGraphicsGetImageFromCurrentImageContext(); + UIGraphicsEndImageContext(); + + return newImage; +} +- (void)sendPost +{ + NSLog(@""); +} + +- (void)sendQuestion +{ + NSLog(@""); +} + +- (IBAction)dissmisModalViewController:(id)sender +{ + [self.navigationController dismissViewControllerAnimated:YES completion:^{ + + }]; +} + + + + + +@end diff --git a/Files/AnimalDataTabBarController.m b/Files/AnimalDataTabBarController.m index 21da4b4..49f9b3c 100644 --- a/Files/AnimalDataTabBarController.m +++ b/Files/AnimalDataTabBarController.m @@ -55,10 +55,10 @@ - (id)initWithAnimal:(Animal*)anAnimal /* Description view*/ /*****************************************/ - AnimalDescriptionWebView *descriptionViewController = [[AnimalDescriptionWebView alloc] initWithAnimal:anAnimal]; - descriptionViewController.title = [Helper languageSelectedStringForKey:@"More"]; - descriptionViewController.tabBarItem.image =[UIImage imageNamed:@"description"]; - [self addChildViewController:descriptionViewController]; +// AnimalDescriptionWebView *descriptionViewController = [[AnimalDescriptionWebView alloc] initWithAnimal:anAnimal]; +// descriptionViewController.title = [Helper languageSelectedStringForKey:@"More"]; +// descriptionViewController.tabBarItem.image =[UIImage imageNamed:@"description"]; +// [self addChildViewController:descriptionViewController]; diff --git a/Files/AnimalDataTableView.m b/Files/AnimalDataTableView.m index 347460a..1e17816 100644 --- a/Files/AnimalDataTableView.m +++ b/Files/AnimalDataTableView.m @@ -74,7 +74,6 @@ -(void)viewDidLoad self.tableView.delegate=self; self.tableView.dataSource = self; - self.tableView.backgroundColor = UIColorFromRGB(0xf8eddf); self.tableView.rowHeight = 60; self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone; diff --git a/Files/AnimalDataTableViewCell.m b/Files/AnimalDataTableViewCell.m index 5a34ee8..a9a8c68 100644 --- a/Files/AnimalDataTableViewCell.m +++ b/Files/AnimalDataTableViewCell.m @@ -72,7 +72,7 @@ - (void)layoutSubviews { self.labelView.frame = CGRectMake(10,6,CGRectGetWidth(self.frame)-10,CGRectGetHeight(self.frame)/4); self.detailLableView.frame = CGRectMake(10,CGRectGetMaxY(self.labelView.frame),CGRectGetWidth(self.frame)-10,CGRectGetHeight(self.labelView.frame)*3);; }else{ - self.labelView.textAlignment = self.detailLableView.textAlignment =UITextAlignmentRight; + self.labelView.textAlignment = self.detailLableView.textAlignment =NSTextAlignmentRight; UIFont *font = [UIFont fontWithName:@"ArialHebrew-Bold" size:14]; self.labelView.font = font; font = [UIFont fontWithName:@"ArialHebrew" size:16]; diff --git a/Files/AnimalDescriptionWebView.h b/Files/AnimalDescriptionWebView.h index 2ea2f6d..fafb93a 100644 --- a/Files/AnimalDescriptionWebView.h +++ b/Files/AnimalDescriptionWebView.h @@ -9,5 +9,7 @@ #import @interface AnimalDescriptionWebView : UIViewController -- (id)initWithAnimal:(Animal*)anAnimal; +@property (weak, nonatomic) IBOutlet UIWebView *descriptionView; +@property (nonatomic,strong) Animal* animal; + @end diff --git a/Files/AnimalDescriptionWebView.m b/Files/AnimalDescriptionWebView.m index 5a72abc..871882f 100644 --- a/Files/AnimalDescriptionWebView.m +++ b/Files/AnimalDescriptionWebView.m @@ -11,8 +11,8 @@ #import "ConservationStatusDataView.h" #import "ConservasionStatusIndicator.h" #import "AnimalsImagesScrollView.h" + @interface AnimalDescriptionWebView() -@property (nonatomic,strong) Animal* animal; @end @implementation AnimalDescriptionWebView @@ -32,45 +32,35 @@ - (void)webViewDidFinishLoad:(UIWebView *)aWebView { } */ - -- (id)initWithAnimal:(Animal*)anAnimal -{ - self = [super init]; - if (self) { - self.animal = anAnimal; - } - return self; -} - -(void)viewDidLoad { [super viewDidLoad]; //conservation sataus ind - ConservasionStatusIndicator *consInd; - ConservationStatusDataView *conStatus; - AnimalsImagesScrollView *imagesScrollView; - if(![self.animal.generalExhibitDescription boolValue]){ - if(IS_IPHONE_5){ - consInd = [[ConservasionStatusIndicator alloc] initWithFrame:CGRectMake(0, 2, 320, 26)]; - }else{ - consInd = [[ConservasionStatusIndicator alloc] initWithFrame:CGRectMake(0, 2, 320, 20)]; - } - [consInd setAnimal:self.animal]; - [self.view addSubview:consInd]; - - - // Initialization code - conStatus = [[ConservationStatusDataView alloc] initWithFrame:CGRectMake(0, CGRectGetMaxY(consInd.frame), CGRectGetWidth(self.view.frame), 80) withConservationStatus:self.animal.conservationStatus]; - [self.view addSubview:conStatus]; - }else{ - if(IS_IPHONE_5){ - imagesScrollView = [[AnimalsImagesScrollView alloc] initWithFrame:CGRectMake(0, 0, 320, 190) withAnimal:self.animal]; - }else{ - imagesScrollView = [[AnimalsImagesScrollView alloc] initWithFrame:CGRectMake(0, 0, 320, 190) withAnimal:self.animal]; - } - [self.view addSubview:imagesScrollView]; - } +// ConservasionStatusIndicator *consInd; +// ConservationStatusDataView *conStatus; +// AnimalsImagesScrollView *imagesScrollView; +// if(![self.animal.generalExhibitDescription boolValue]){ +// if(IS_IPHONE_5){ +// consInd = [[ConservasionStatusIndicator alloc] initWithFrame:CGRectMake(0, 2, 320, 26)]; +// }else{ +// consInd = [[ConservasionStatusIndicator alloc] initWithFrame:CGRectMake(0, 2, 320, 20)]; +// } +// [consInd setAnimal:self.animal]; +// [self.view addSubview:consInd]; +// +// +// // Initialization code +// conStatus = [[ConservationStatusDataView alloc] initWithFrame:CGRectMake(0, CGRectGetMaxY(consInd.frame), CGRectGetWidth(self.view.frame), 80) withConservationStatus:self.animal.conservationStatus]; +// [self.view addSubview:conStatus]; +// }else{ +// if(IS_IPHONE_5){ +// imagesScrollView = [[AnimalsImagesScrollView alloc] initWithFrame:CGRectMake(0, 0, 320, 190) withAnimal:self.animal]; +// }else{ +// imagesScrollView = [[AnimalsImagesScrollView alloc] initWithFrame:CGRectMake(0, 0, 320, 190) withAnimal:self.animal]; +// } +// [self.view addSubview:imagesScrollView]; +// } //add UIWebView for the animal main text @@ -80,18 +70,10 @@ -(void)viewDidLoad dir = @"rtl"; langClass = @"dirrtl"; } - CGRect webRect =self.view.bounds; - if(![self.animal.generalExhibitDescription boolValue]){ - webRect.origin.y = CGRectGetMaxY(conStatus.frame); - webRect.size.height = CGRectGetHeight(self.view.bounds)-conStatus.frame.size.height - self.tabBarController.tabBar.frame.size.height-30; - }else{ - webRect.origin.y = CGRectGetMaxY(imagesScrollView.frame); - webRect.size.height = CGRectGetHeight(self.view.bounds)-imagesScrollView.frame.size.height - self.tabBarController.tabBar.frame.size.height-30; - } - UIWebView *descriptionView = [[UIWebView alloc] initWithFrame:webRect]; - descriptionView.backgroundColor = UIColorFromRGB(0xf8eddf); - descriptionView.opaque=YES; - descriptionView.delegate=self; + + self.descriptionView.backgroundColor = UIColorFromRGB(0xf8eddf); + self.descriptionView.opaque=YES; + self.descriptionView.delegate=self; NSString *cssPath = [[NSBundle mainBundle] pathForResource:@"style" ofType:@"css"]; @@ -105,10 +87,8 @@ -(void)viewDidLoad new = [new stringByReplacingOccurrencesOfString:@"u2013" withString:@"-"]; - [descriptionView loadHTMLString:new baseURL:baseURL]; + [self.descriptionView loadHTMLString:new baseURL:baseURL]; - [self.view addSubview:descriptionView]; - } diff --git a/Files/AnimalPostsTableViewController.m b/Files/AnimalPostsTableViewController.m index 478f082..f07fe8a 100644 --- a/Files/AnimalPostsTableViewController.m +++ b/Files/AnimalPostsTableViewController.m @@ -40,7 +40,6 @@ - (id)initWithStyle:(UITableViewStyle)style forAnimal:(Animal*)anAnimal // The className to query on self.className = @"AnimalPost"; - self.tableView.backgroundColor = UIColorFromRGB(0xF8EDDF); // Whether the built-in pull-to-refresh is enabled self.pullToRefreshEnabled = NO; @@ -366,7 +365,6 @@ - (PFTableViewCell *)tableView:(UITableView *)tableView reuseIdentifier:CellIdentifier]; } - [cell setObject:object atIndex:indexPath.row isQuestion:NO]; return cell; diff --git a/Files/AnimalQuestionsCell.h b/Files/AnimalQuestionsCell.h index e7faea2..ad2bfa8 100644 --- a/Files/AnimalQuestionsCell.h +++ b/Files/AnimalQuestionsCell.h @@ -11,9 +11,8 @@ @interface AnimalQuestionsCell : PFTableViewCell @property (nonatomic,strong) PFObject *questionObject; -@property (nonatomic,strong) UILabel *labelView; -@property (nonatomic,strong) UILabel *detailLableView; - --(void)setObject:(PFObject *)anObject atIndex:(NSInteger)cellIndex isQuestion:(BOOL)isQuestion; +@property (nonatomic,strong) IBOutlet UILabel *labelView; +@property (nonatomic,strong) IBOutlet UILabel *detailLableView; +@property (nonatomic,strong) IBOutlet UIImageView *iconView; @end diff --git a/Files/AnimalQuestionsCell.m b/Files/AnimalQuestionsCell.m index f2ae13b..bdde245 100644 --- a/Files/AnimalQuestionsCell.m +++ b/Files/AnimalQuestionsCell.m @@ -12,120 +12,12 @@ @implementation AnimalQuestionsCell -@synthesize questionObject; @synthesize labelView; @synthesize detailLableView; -+ (Class)layerClass +- (void)awakeFromNib { - return [CAGradientLayer class]; + self.labelView.textAlignment = self.detailLableView.textAlignment = [Helper appLang]==kHebrew ?NSTextAlignmentRight : NSTextAlignmentLeft; } -- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - - if ((self = [super initWithStyle:style reuseIdentifier:reuseIdentifier])) { - - self.selectionStyle = UITableViewCellSelectionStyleNone; - questionObject = nil; - labelView = nil; - - UIFont *font = [UIFont fontWithName:@"Futura-CondensedExtraBold" size:14]; - UILabel *label = [[UILabel alloc] initWithFrame:CGRectZero]; - label.font = font; - label.backgroundColor = [UIColor clearColor]; - label.numberOfLines=0; - labelView = label; - [self.contentView addSubview:labelView]; - - - label = [[UILabel alloc] initWithFrame:CGRectZero]; - font = [UIFont fontWithName:@"Futura" size:14]; - - label.font = font; - label.backgroundColor = [UIColor clearColor]; - label.numberOfLines=1; - detailLableView = label; - [self.contentView addSubview:detailLableView]; - - - - } - return self; -} - - -- (void)layoutSubviews { - [super layoutSubviews]; - if ([Helper appLang]==kEnglish) { - CGRect rect = CGRectMake(10,(self.bounds.size.height-60)/2, 60, 60); - self.imageView.frame = rect; - rect = CGRectMake(rect.size.width+20,5,240,(self.contentView.bounds.size.height-26)); - labelView.frame = rect; - rect.origin.y = CGRectGetMaxY(rect); - rect.size.height = 20; - detailLableView.textAlignment= UITextAlignmentLeft; - labelView.textAlignment= UITextAlignmentLeft; - detailLableView.frame = rect; - - }else{ - - CGRect rect = CGRectMake(self.bounds.size.width-65,25, 60, 60); - self.imageView.frame = rect; - rect = CGRectMake(5, 4, 240, (self.contentView.bounds.size.height-26)); - labelView.frame = rect; - labelView.textAlignment = UITextAlignmentRight; - rect.origin.y = CGRectGetMaxY(rect); - rect.size.height = 20; - detailLableView.frame = rect; - detailLableView.textAlignment= NSTextAlignmentRight; - } - - self.imageView.layer.borderWidth = 4.0; - self.imageView.layer.borderColor = UIColorFromRGB(0x3A2E23).CGColor; - self.imageView.layer.cornerRadius =30; - self.imageView.clipsToBounds=YES; - self.imageView.layer.shouldRasterize=YES; - -} - - --(void)setObject:(PFObject *)anObject atIndex:(NSInteger)cellIndex isQuestion:(BOOL)isQuestion{ - if (anObject != questionObject) { - questionObject = anObject; - } - - NSArray * cellColors = @[(id)[UIColorFromRGB(0xf8eddf) CGColor], - (id)[UIColorFromRGB(0xf8eddf) CGColor], - - (id)[UIColorFromRGB(0xBDB38C) CGColor], - (id)[UIColorFromRGB(0xBDB38C) CGColor]]; - - // Set the colors for the gradient layer. - - NSInteger index = (cellIndex%2!=0)? 0:2; - CAGradientLayer *gradientLayer_ = (CAGradientLayer *)self.layer; - [gradientLayer_ setContentsScale:[[UIScreen mainScreen] scale]]; - gradientLayer_.colors =@[cellColors[index], - cellColors[index++]]; - - if(isQuestion) - { - NSString *key = [Helper appLang]==kHebrew? @"question":@"question_en"; - NSString *title = questionObject[key]; - NSString *subtitle = questionObject[@"user_name"]; - self.labelView.text = title; - self.detailLableView.text =subtitle; - self.imageView.image = [UIImage imageNamed:@"question"]; - }else{ - NSString *key = [Helper appLang]==kHebrew? @"text":@"text"; - NSString *title = questionObject[key]; - NSString *subtitle = questionObject[@"user"]; - self.labelView.text = title; - self.detailLableView.text =subtitle; - self.imageView.image = [UIImage imageNamed:@"postCellIcon"]; - } - [self setNeedsDisplay]; -} - - @end diff --git a/Files/AnimalQuestionsTableView.m b/Files/AnimalQuestionsTableView.m index af288b9..11b0aca 100644 --- a/Files/AnimalQuestionsTableView.m +++ b/Files/AnimalQuestionsTableView.m @@ -37,7 +37,6 @@ - (id)initWithStyle:(UITableViewStyle)style forAnimal:(Animal*)anAnimal // The className to query on self.className = @"AnimalQuestions"; - self.tableView.backgroundColor = UIColorFromRGB(0xF8EDDF); // Whether the built-in pull-to-refresh is enabled self.pullToRefreshEnabled = NO; @@ -364,7 +363,6 @@ - (PFTableViewCell *)tableView:(UITableView *)tableView reuseIdentifier:CellIdentifier]; } - [cell setObject:object atIndex:indexPath.row isQuestion:YES]; return cell; } diff --git a/Files/AnimalSpecificQuestionsTableView.m b/Files/AnimalSpecificQuestionsTableView.m index 9133e0c..ee6f900 100644 --- a/Files/AnimalSpecificQuestionsTableView.m +++ b/Files/AnimalSpecificQuestionsTableView.m @@ -30,7 +30,6 @@ - (id)initWithFrame:(CGRect)frame withAnimal:(Animal*)anAnimal withParentControl UITableView *dataTableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, 320, 240) style:UITableViewStylePlain]; dataTableView.delegate=self; dataTableView.dataSource = self; - dataTableView.backgroundColor = UIColorFromRGB(0xf8eddf); dataTableView.rowHeight = 100; dataTableView.separatorStyle = UITableViewCellSeparatorStyleNone; [dataTableView setCanCancelContentTouches:YES]; @@ -213,7 +212,6 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N reuseIdentifier:CellIdentifier]; } PFObject *object = [self.tableViewdata objectAtIndex:indexPath.row]; - [cell setObject:object atIndex:indexPath.row isQuestion:YES]; return cell; diff --git a/Files/AnimalViewController.m b/Files/AnimalViewController.m index f0b2205..033c17c 100644 --- a/Files/AnimalViewController.m +++ b/Files/AnimalViewController.m @@ -58,7 +58,7 @@ - (id)init{ name:@"PostEditingEnded" object:nil]; - UIBarButtonItem *mapButton = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"088-Map_white.png"] style:UIBarButtonItemStyleDone target:self action:@selector(showOnMap)]; + UIBarButtonItem *mapButton = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"852-map"] style:UIBarButtonItemStyleDone target:self action:@selector(showOnMap)]; self.navigationItem.rightBarButtonItem = mapButton; diff --git a/Files/EventTableViewCell.m b/Files/EventTableViewCell.m index 9e11eff..a714cec 100644 --- a/Files/EventTableViewCell.m +++ b/Files/EventTableViewCell.m @@ -33,7 +33,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus labelView = nil; - UIFont *font = [UIFont fontWithName:@"Futura-CondensedExtraBold" size:18]; + UIFont *font = [UIFont fontWithName:@"Avenir-Heavy" size:18]; UILabel *label = [[UILabel alloc] initWithFrame:CGRectZero]; label.font = font; @@ -46,7 +46,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus label = [[UILabel alloc] initWithFrame:CGRectZero]; - font = [UIFont fontWithName:@"Futura" size:14]; + font = [UIFont fontWithName:@"Avenir-Book" size:14]; label.font = font; label.backgroundColor = [UIColor clearColor]; label.textAlignment = UITextAlignmentLeft; @@ -57,9 +57,9 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus label = [[UILabel alloc] initWithFrame:CGRectZero]; - font = [UIFont fontWithName:@"Futura" size:14]; + font = [UIFont fontWithName:@"Avenir-Book" size:14]; label.font = font; - label.backgroundColor = UIColorFromRGBA(0x00000, .1); + label.backgroundColor = [UIColor colorWithWhite:0 alpha:.1]; label.textAlignment = UITextAlignmentCenter; label.textColor = [UIColor blackColor]; label.numberOfLines=4; @@ -67,9 +67,9 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus [self.contentView addSubview:timeLableView]; label = [[UILabel alloc] initWithFrame:CGRectZero]; - font = [UIFont fontWithName:@"Futura" size:12]; + font = [UIFont fontWithName:@"Avenir-Book" size:12]; label.font = font; - label.backgroundColor = UIColorFromRGBA(0x00000, .1); + label.backgroundColor = [UIColor colorWithWhite:0 alpha:.1]; label.textAlignment = UITextAlignmentCenter; label.textColor = [UIColor blackColor]; label.numberOfLines=2; @@ -89,7 +89,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus self.frame = CGRectMake(self.frame.origin.x, self.frame.origin.y, self.frame.size.width, 70); UIView *bgView = [[UIView alloc] initWithFrame:self.bounds]; - bgView.backgroundColor = UIColorFromRGB(0xBDB38C); + bgView.backgroundColor = [UIColor colorWithRed:0.749 green:0.737 blue:0.631 alpha:1]; [self setSelectedBackgroundView:bgView]; self.accessoryType = UITableViewCellAccessoryNone; } @@ -113,15 +113,15 @@ - (void)layoutSubviews { //if () { if ([Helper appLang] == kEnglish){ self.cellImageView.frame = CGRectMake(0, 15, 40,40); - self.detailLableView.textAlignment = self.labelView.textAlignment = UITextAlignmentLeft; - self.labelView.frame = CGRectMake(self.cellImageView.frame.size.width+5,0,190,25); + self.detailLableView.textAlignment = self.labelView.textAlignment = NSTextAlignmentLeft; + self.labelView.frame = CGRectMake(self.cellImageView.frame.size.width+5,15,190,25); self.detailLableView.frame = CGRectMake(self.cellImageView.frame.size.width+5,25,190,45);; self.timeLableView.frame = CGRectMake(CGRectGetWidth(self.bounds)-80,0,80,25); self.locationLableView.frame = CGRectMake(CGRectGetWidth(self.bounds)-80,25,80,45); }else{ - self.detailLableView.textAlignment = self.labelView.textAlignment = UITextAlignmentRight; + self.detailLableView.textAlignment = self.labelView.textAlignment = NSTextAlignmentRight; self.cellImageView.frame = CGRectMake(CGRectGetWidth(self.bounds)-50, 15, 50,50); - self.labelView.frame = CGRectMake(CGRectGetWidth(self.bounds)-210,0,160,25); + self.labelView.frame = CGRectMake(CGRectGetWidth(self.bounds)-210,8,160,25); self.detailLableView.frame = CGRectMake(CGRectGetWidth(self.bounds)-210,25,160,45);; self.timeLableView.frame = CGRectMake(0,0,80,25); self.locationLableView.frame = CGRectMake(0,25,80,45); @@ -177,9 +177,22 @@ - (void)setAnEvent:(Event *)anEvent{ UIImage *cellImage= [event icon]; [self.cellImageView setImage:cellImage]; + switch ([event.type intValue]) { + case kEventTypeFeeding: + cellImageView.tintColor = [UIColor colorWithRed:0.243 green:0.435 blue:0.478 alpha:1]; + break; + case kEventTypeTalk: + cellImageView.tintColor = [UIColor colorWithRed:0.463 green:0.365 blue:0.322 alpha:1]; + break; + + default: + cellImageView.tintColor = [UIColor colorWithRed:0.925 green:0.282 blue:0.090 alpha:1]; + + break; + } - - + self.cellImageView.image = [self.cellImageView.image imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; + [labelView setNeedsDisplay]; [detailLableView setNeedsDisplay]; diff --git a/Files/EventsTableViewController.m b/Files/EventsTableViewController.m index f0d3f17..2a8fee9 100644 --- a/Files/EventsTableViewController.m +++ b/Files/EventsTableViewController.m @@ -26,10 +26,8 @@ @interface EventsTableViewController () @implementation EventsTableViewController -- (id)initWithStyle:(UITableViewStyle)style +- (void)awakeFromNib { - self = [super initWithStyle:style]; - if (self) { // Custom initialization self.title = [Helper languageSelectedStringForKey:@"Events"]; @@ -41,8 +39,7 @@ - (id)initWithStyle:(UITableViewStyle)style updateLoopCounter=1; shouldUpdateUI=NO; - } - return self; + } @@ -120,7 +117,6 @@ - (void)viewDidLoad self.tableView.delegate=self; - self.tableView.backgroundColor = UIColorFromRGB(0x8C817B); //segmentedController @@ -137,24 +133,23 @@ - (void)viewDidLoad action:@selector(reloadTableViewAfterSegmentedControllerChange:) forControlEvents:UIControlEventValueChanged]; - segmentedControl.tintColor = UIColorFromRGB(0x8C9544); segmentedControl.selectedSegmentIndex = 0; self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone; self.tableView.rowHeight=70; - //update calendar if it is empty - if([[Event findAll] count]==0){ - [self updateCalendar]; - } - else - { - [[Event findAll] enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) { - NSLog(@"event = %@",((Event*)obj).title); - }]; - } - +// //update calendar if it is empty +// if([[Event findAll] count]==0){ +// [self updateCalendar]; +// } +// else +// { +// [[Event findAll] enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) { +// NSLog(@"event = %@",((Event*)obj).title); +// }]; +// } +// } @@ -281,20 +276,6 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N } -- (void)tableView:(UITableView *)tableView - willDisplayCell:(UITableViewCell *)cell -forRowAtIndexPath:(NSIndexPath *)indexPath -{ - Event *event = [self.fetchedResultsController objectAtIndexPath:indexPath]; - - // Set the colors for the gradient layer. -// CAGradientLayer *gradientLayer_ = (CAGradientLayer *)cell.contentView.layer; -// [gradientLayer_ setContentsScale:[[UIScreen mainScreen] scale]]; - NSArray *cellColors = [event colors]; - // gradientLayer_.colors =@[cellColors[0], - // cellColors[1]]; - cell.contentView.backgroundColor = [UIColor yellowColor]; -} #pragma mark - Table view delegate diff --git a/Files/ExhibitAnimalsViewController.m b/Files/ExhibitAnimalsViewController.m index 5523582..53347bc 100644 --- a/Files/ExhibitAnimalsViewController.m +++ b/Files/ExhibitAnimalsViewController.m @@ -41,11 +41,10 @@ - (void)viewDidLoad // Uncomment the following line to preserve selection between presentations. self.clearsSelectionOnViewWillAppear = YES; - self.tableView.backgroundColor = UIColorFromRGB(0x8C9544); UIView *headerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 320, 60)]; - headerView.backgroundColor = UIColorFromRGB(0x3A2E23); + headerView.backgroundColor = [UIColor colorWithRed:0.925 green:0.282 blue:0.090 alpha:1]; self.tableView.tableHeaderView = headerView; UIImageView *iconView = [[UIImageView alloc] initWithFrame:CGRectMake(10, 10, 40, 40)]; @@ -82,9 +81,6 @@ - (void)viewDidUnload -(void)viewWillAppear:(BOOL)animated{ [super viewWillAppear:animated]; - self.navigationController.navigationBar.barStyle = UIBarStyleBlack; - self.navigationController.navigationBar.translucent =NO; - self.tableView.backgroundColor = UIColorFromRGB(0x7F7960); self.tableView.separatorStyle = UITableViewCellSeparatorStyleSingleLine; self.tableView.separatorColor = UIColorFromRGBA(0xffffff, .2); self.tableView.rowHeight = 60; @@ -165,4 +161,12 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath } +- (void)tableView:(UITableView *)tableView + willDisplayCell:(UITableViewCell *)cell +forRowAtIndexPath:(NSIndexPath *)indexPath +{ + + cell.contentView.backgroundColor =[UIColor colorWithRed:0.933 green:0.949 blue:0.902 alpha:1]; +} + @end diff --git a/Files/ExhibitTableViewCell.m b/Files/ExhibitTableViewCell.m index 7f92e4f..6f4ed8b 100644 --- a/Files/ExhibitTableViewCell.m +++ b/Files/ExhibitTableViewCell.m @@ -29,7 +29,10 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus self.nameLabel.backgroundColor = [UIColor clearColor]; self.iconImageView = [[UIImageView alloc] initWithFrame:CGRectZero]; + + // [ self.iconImageView setTintColor:[UIColor redColor]]; self.auodioGuideIndicator = [[UIImageView alloc] initWithFrame:CGRectZero]; + [ self.auodioGuideIndicator setTintColor:[UIColor redColor]]; self.manyAnimalsIndicator= [[UIImageView alloc] initWithFrame:CGRectZero]; [self addSubview:self.manyAnimalsIndicator]; @@ -37,9 +40,9 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus [self addSubview:self.iconImageView]; [self addSubview:self.nameLabel]; - UIView *bgView = [[UIView alloc] initWithFrame:self.bounds]; - bgView.backgroundColor = UIColorFromRGB(0xf8eddf); - [self setSelectedBackgroundView:bgView]; +// UIView *bgView = [[UIView alloc] initWithFrame:self.bounds]; +// bgView.backgroundColor = UIColorFromRGB(0xf8eddf); +// [self setSelectedBackgroundView:bgView]; self.accessoryType = UITableViewCellAccessoryNone; } return self; @@ -65,7 +68,7 @@ -(void)layoutSubviews{ UIImage *icon = [[exhibit icon] normalize]; self.iconImageView.image = icon; - + self.iconImageView.image = [self.iconImageView.image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]; if([Helper appLang]==kHebrew){ self.nameLabel.text =self.exhibit.name; [self.nameLabel setFrame:CGRectMake(10,0,250,CGRectGetHeight(self.bounds))]; diff --git a/Files/ExhibitsViewController.m b/Files/ExhibitsViewController.m index c75db0d..4c3126b 100644 --- a/Files/ExhibitsViewController.m +++ b/Files/ExhibitsViewController.m @@ -16,12 +16,13 @@ #import "ZooInfoViewController.h" #import "SettingsViewController.h" #import "AnimalDataTabBarController.h" +#import "AnimalDataNewViewController.h" @interface ExhibitsViewController () -(void)storeNewAnimalObjectsLocallyInContext:(NSManagedObjectContext*)moc updateOldEntities:(BOOL)update; -(void)storeNewExhibitsLocallyInContext:(NSManagedObjectContext*)moc updateOldEntities:(BOOL)update; -(void)updateExhibitsAndAnimalsImManagedContext:(NSManagedObjectContext*)moc updateExisting:(BOOL)update; - +@property (nonatomic, strong)Exhibit *selectedExhibit; @end @implementation ExhibitsViewController @@ -30,10 +31,9 @@ @implementation ExhibitsViewController @synthesize headerButtonIconView; @synthesize headerButtonLabel; @synthesize headerButton; -- (id)initWithStyle:(UITableViewStyle)style +- (void)awakeFromNib { - self = [super initWithStyle:style]; - if (self) { + self.title = [Helper languageSelectedStringForKey:@"Exhibits"]; /* @@ -44,16 +44,15 @@ - (id)initWithStyle:(UITableViewStyle)style */ - UIBarButtonItem *infoBarItem = [[UIBarButtonItem alloc] initWithTitle:[Helper languageSelectedStringForKey:@"Info"] style:UIBarButtonItemStyleDone target:self action:@selector(showInfoController)]; + UIBarButtonItem *infoBarItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"724-info"] style:UIBarButtonItemStylePlain target:self action:@selector(showInfoController)]; self.navigationItem.leftBarButtonItem = infoBarItem; //073-Setting - UIBarButtonItem *settingsBarItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"073-Setting"] style:UIBarButtonItemStyleDone target:self action:@selector(showSettings)]; + UIBarButtonItem *settingsBarItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"740-gear"] style:UIBarButtonItemStyleDone target:self action:@selector(showSettings)]; self.navigationItem.rightBarButtonItem = settingsBarItem; - } - return self; + } -(void)showSettings{ SettingsViewController *settingsController = [[SettingsViewController alloc] initWithNibName:@"SettingsViewController" bundle:[Helper localizationBundle]]; @@ -98,11 +97,11 @@ - (void)viewDidLoad font = [UIFont fontWithName:@"Futura" size:20]; textAlign = UITextAlignmentLeft; } - self.headerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 320, 60)]; - self.headerView.backgroundColor = [UIColor whiteColor]; + self.headerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 320, 50)]; + self.headerView.backgroundColor = [UIColor colorWithRed:0.925 green:0.282 blue:0.090 alpha:1]; self.headerButton = [UIButton buttonWithType:UIButtonTypeCustom]; - self.headerButton.frame = CGRectMake(0, 0, 320, 60); + self.headerButton.frame = CGRectMake(0, 0, 320, 50); self.headerButtonIconView = [[UIImageView alloc] initWithFrame:iconRect]; @@ -118,6 +117,8 @@ - (void)viewDidLoad self.tableView.tableHeaderView = self.headerView; + + [self updateHeaderView]; } @@ -140,16 +141,16 @@ -(void)updateHeaderView{ if (exhibitsHasPendingUpdates) { // Do any additional setup after loading the view, typically from a nib. - self.headerButton.backgroundColor = UIColorFromRGB(0x3A2E23); + self.headerButton.backgroundColor = [UIColor colorWithRed:0.925 green:0.282 blue:0.090 alpha:1]; [self.headerButton addTarget:self action:@selector(updateAnimalsData) forControlEvents:UIControlEventTouchUpInside]; [self.headerButtonIconView setImage:[UIImage imageNamed:@"156-Cycle"]]; if(exhibitsHasPendingUpdates)self.headerButtonLabel.text = [Helper languageSelectedStringForKey:@"Update available for exhibits"]; }else{ //nearest exhibit - self.headerButton.backgroundColor = UIColorFromRGB(0x8C9544); + self.headerButton.backgroundColor = [UIColor colorWithRed:0.925 green:0.282 blue:0.090 alpha:1]; [self.headerButton addTarget:self action:@selector(findNearestExhibit) forControlEvents:UIControlEventTouchUpInside]; - [self.headerButtonIconView setImage:[UIImage imageNamed:@"343-Wand"]]; + [self.headerButtonIconView setImage:[UIImage imageNamed:@"873-magic-wand"]]; [self.headerButton addSubview:self.headerButtonIconView]; self.headerButtonLabel.text = [Helper languageSelectedStringForKey:@"Show Nearest Exhibit"]; @@ -194,11 +195,8 @@ - (void)findNearestExhibit -(void)viewWillAppear:(BOOL)animated{ [super viewWillAppear:animated]; - self.navigationController.navigationBar.barStyle = UIBarStyleBlack; - self.navigationController.navigationBar.translucent =NO;; - self.tableView.backgroundColor = UIColorFromRGB(0xBDB38C); self.tableView.separatorStyle = UITableViewCellSeparatorStyleSingleLine; - self.tableView.separatorColor = UIColorFromRGBA(0xffffff, .2); + self.tableView.separatorColor = [UIColor colorWithRed:0.749 green:0.737 blue:0.631 alpha:1]; self.tableView.rowHeight = 60; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ @@ -261,9 +259,13 @@ - (void)showExhibit:(Exhibit*)exhibit; [self updateHeaderView]; NSArray *animals = [exhibit localAnimals]; if ([animals count]==1) { - AnimalDataTabBarController *anialViewController = [[AnimalDataTabBarController alloc] initWithAnimal:[animals lastObject]]; - [anialViewController setHidesBottomBarWhenPushed:YES]; - [self.navigationController pushViewController:anialViewController animated:YES]; + [self performSegueWithIdentifier:@"SelectedSingleAnimalExhibit" sender:self]; +// UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"AnimalsStoryboard" bundle:[Helper localizationBundle]]; +// AnimalDataNewViewController *animalDataViewCOntroller = [storyboard instantiateViewControllerWithIdentifier:@"AnimalDataNewViewController"]; +// animalDataViewCOntroller.animal = [animals lastObject]; +// animalDataViewCOntroller.title = [[animals lastObject] name]; +// [self.navigationController pushViewController:animalDataViewCOntroller animated:YES]; + } else if([animals count]>1){ ExhibitAnimalsViewController * exhibitAnimalsViewController = [[ExhibitAnimalsViewController alloc] initWithStyle:UITableViewStylePlain]; @@ -283,10 +285,21 @@ - (void)showExhibit:(Exhibit*)exhibit; } +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender +{ + NSArray *animals = [self.selectedExhibit localAnimals]; + + AnimalDataNewViewController *animalDataViewCOntroller = (AnimalDataNewViewController *)segue.destinationViewController; + animalDataViewCOntroller.animal = [animals lastObject]; + animalDataViewCOntroller.title = [[animals lastObject] name]; + +} + - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { Exhibit *exhibit = (Exhibit*) [[self fetchedResultsController] objectAtIndexPath:indexPath]; + self.selectedExhibit = exhibit; [self showExhibit:exhibit]; } diff --git a/Files/ExhibitsViewController.xib b/Files/ExhibitsViewController.xib index dcf9e29..d31ae0b 100644 --- a/Files/ExhibitsViewController.xib +++ b/Files/ExhibitsViewController.xib @@ -1,142 +1,25 @@ - - - - 1280 - 11C25 - 1919 - 1138.11 - 566.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 916 - - - IBProxyObject - IBUITableView - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - PluginDependencyRecalculationVersion - - - - - IBFilesOwner - IBCocoaTouchFramework - - - IBFirstResponder - IBCocoaTouchFramework - - - - 274 - {{0, 20}, {320, 460}} - - - - - 3 - MQA - - NO - YES - NO - - IBCocoaTouchFramework - NO - 1 - 0 - YES - 44 - 22 - 22 - - - - - - - view - - - - 5 - - - - dataSource - - - - 6 - - - - delegate - - - - 7 - - - - - - 0 - - - - - - -1 - - - File's Owner - - - -2 - - - - - 4 - - - - - - - ExhibitsViewController - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - - - 7 - - - - - ExhibitsViewController - UIViewController - - IBProjectSource - ./Classes/ExhibitsViewController.h - - - - - 0 - IBCocoaTouchFramework - YES - 3 - 916 - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Files/Helpers/Helper.h b/Files/Helpers/Helper.h index 6daa24a..843fd94 100644 --- a/Files/Helpers/Helper.h +++ b/Files/Helpers/Helper.h @@ -42,5 +42,9 @@ +(void)setCurrentExhibit:(Exhibit*)exhibit; +(void)saveContext; + ++ (UIColor*)colorForConservationStatus:(ConservationStatus)status; ++ (UIColor*)textColorForConservationStatus:(ConservationStatus)status; + @end diff --git a/Files/Helpers/Helper.m b/Files/Helpers/Helper.m index 911412d..54e08aa 100644 --- a/Files/Helpers/Helper.m +++ b/Files/Helpers/Helper.m @@ -260,6 +260,69 @@ +(NSString*)visitoresChannelName{ } ++ (UIColor*)colorForConservationStatus:(ConservationStatus)status +{ + switch (status) { + case ConLC: + return UIColorFromRGB(0x06968); + break; + case ConNT: + return UIColorFromRGB(0x06968); + break; + case ConVU: + return UIColorFromRGB(0xD59A00); + break; + case ConEN: + return UIColorFromRGB(0xDC5D02); + break; + case ConCR: + return UIColorFromRGB(0xDF0012); + break; + case ConEW: + return [UIColor blackColor]; + break; + case ConEX: + return [UIColor blackColor]; + break; + + default: + break; + } + +} + ++ (UIColor*)textColorForConservationStatus:(ConservationStatus)status +{ + switch (status) { + case ConLC: + return [UIColor whiteColor]; + break; + case ConNT: + return UIColorFromRGB(0x87D295); + break; + case ConVU: + return [UIColor whiteColor]; + break; + case ConEN: + return [UIColor whiteColor]; + break; + case ConCR: + return [UIColor whiteColor]; + break; + case ConEW: + return [UIColor whiteColor]; + break; + case ConEX: + return UIColorFromRGB(0xDF0012); + break; + + default: + break; + } + +} + + @end diff --git a/Files/Helpers/Reachability.m b/Files/Helpers/Reachability.m index ea2a968..58b3d05 100644 --- a/Files/Helpers/Reachability.m +++ b/Files/Helpers/Reachability.m @@ -216,7 +216,7 @@ -(BOOL)startNotifier //clear out the dispatch queue if(self.reachabilitySerialQueue) { - dispatch_release(self.reachabilitySerialQueue); + // dispatch_release(self.reachabilitySerialQueue); self.reachabilitySerialQueue = nil; } @@ -240,7 +240,7 @@ -(BOOL)startNotifier // then clear out the dispatch queue if(self.reachabilitySerialQueue) { - dispatch_release(self.reachabilitySerialQueue); + // dispatch_release(self.reachabilitySerialQueue); self.reachabilitySerialQueue = nil; } @@ -262,7 +262,7 @@ -(void)stopNotifier if(self.reachabilitySerialQueue) { - dispatch_release(self.reachabilitySerialQueue); + //dispatch_release(self.reachabilitySerialQueue); self.reachabilitySerialQueue = nil; } diff --git a/Files/JerusalemBiblicalZoo-Info.plist b/Files/JerusalemBiblicalZoo-Info.plist index e0c8d5a..8cf2531 100644 --- a/Files/JerusalemBiblicalZoo-Info.plist +++ b/Files/JerusalemBiblicalZoo-Info.plist @@ -55,8 +55,8 @@ LSRequiresIPhoneOS - NSMainNibFile - MainWindow + UIMainStoryboardFile + MainStoryboard UIBackgroundModes audio @@ -76,11 +76,11 @@ TintColor Blue - 0.13266259431838989 + 0.1326625943183899 Green - 0.18234409391880041 + 0.1823440939188004 Red - 0.24140989780426031 + 0.2414098978042603 Translucent diff --git a/Files/JerusalemBiblicalZoo-Prefix.pch b/Files/JerusalemBiblicalZoo-Prefix.pch index 368bb11..f8f5d2e 100644 --- a/Files/JerusalemBiblicalZoo-Prefix.pch +++ b/Files/JerusalemBiblicalZoo-Prefix.pch @@ -23,4 +23,6 @@ #import "CoreData+MagicalRecord.h" #import "MBProgressHUD.h" #import + #import "UIAlertView+Blocks.h" + #import "UIActionSheet+Blocks.h" #endif diff --git a/Files/JerusalemBiblicalZoo.xcodeproj/project.pbxproj b/Files/JerusalemBiblicalZoo.xcodeproj/project.pbxproj index f8d5fed..c5de810 100644 --- a/Files/JerusalemBiblicalZoo.xcodeproj/project.pbxproj +++ b/Files/JerusalemBiblicalZoo.xcodeproj/project.pbxproj @@ -340,6 +340,9 @@ 39331D931914155B00BF550A /* NSTimeZone+ProperAbbreviation.m in Sources */ = {isa = PBXBuildFile; fileRef = 39331D8F1914155B00BF550A /* NSTimeZone+ProperAbbreviation.m */; }; 39331D96191425DD00BF550A /* EventsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 39331D95191425DD00BF550A /* EventsController.m */; }; 3940506915B95F3300FCE4D6 /* EventKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3940506815B95F3300FCE4D6 /* EventKit.framework */; }; + 3940655A192569430056D057 /* MainStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 39406559192569430056D057 /* MainStoryboard.storyboard */; }; + 394065601925F2730056D057 /* AnimalDataNewViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3940655F1925F2730056D057 /* AnimalDataNewViewController.m */; }; + 394065631925F98D0056D057 /* ViewQuestionsOrPostsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 394065621925F98D0056D057 /* ViewQuestionsOrPostsViewController.m */; }; 394B348716766C9D0021C507 /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 394B348616766C9D0021C507 /* Accounts.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 394B348916766CA60021C507 /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 394B348816766CA60021C507 /* Social.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 394B348B16766CC10021C507 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 394B348A16766CC10021C507 /* StoreKit.framework */; }; @@ -348,6 +351,52 @@ 39508BC815A8B00A00BD8365 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 39508BC715A8B00A00BD8365 /* libz.dylib */; }; 39559478167DE0AA00F3737C /* AnimalAddPostView.m in Sources */ = {isa = PBXBuildFile; fileRef = 39559477167DE0A900F3737C /* AnimalAddPostView.m */; }; 39579B00158878A700DCCFD9 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 39579AFF158878A700DCCFD9 /* CoreData.framework */; }; + 39634C52191509A000647DAE /* 704-compose-selected.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C32191509A000647DAE /* 704-compose-selected.png */; }; + 39634C53191509A000647DAE /* 704-compose-selected@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C33191509A000647DAE /* 704-compose-selected@2x.png */; }; + 39634C54191509A000647DAE /* 704-compose.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C34191509A000647DAE /* 704-compose.png */; }; + 39634C55191509A000647DAE /* 704-compose@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C35191509A000647DAE /* 704-compose@2x.png */; }; + 39634C56191509A000647DAE /* 714-camera-selected.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C36191509A000647DAE /* 714-camera-selected.png */; }; + 39634C57191509A000647DAE /* 714-camera-selected@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C37191509A000647DAE /* 714-camera-selected@2x.png */; }; + 39634C58191509A000647DAE /* 714-camera.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C38191509A000647DAE /* 714-camera.png */; }; + 39634C59191509A000647DAE /* 714-camera@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C39191509A000647DAE /* 714-camera@2x.png */; }; + 39634C5A191509A000647DAE /* 815-car-selected.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C3A191509A000647DAE /* 815-car-selected.png */; }; + 39634C5B191509A000647DAE /* 815-car-selected@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C3B191509A000647DAE /* 815-car-selected@2x.png */; }; + 39634C5C191509A000647DAE /* 815-car.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C3C191509A000647DAE /* 815-car.png */; }; + 39634C5D191509A000647DAE /* 815-car@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C3D191509A000647DAE /* 815-car@2x.png */; }; + 39634C5E191509A000647DAE /* 851-calendar-selected.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C3E191509A000647DAE /* 851-calendar-selected.png */; }; + 39634C5F191509A000647DAE /* 851-calendar-selected@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C3F191509A000647DAE /* 851-calendar-selected@2x.png */; }; + 39634C60191509A000647DAE /* 851-calendar.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C40191509A000647DAE /* 851-calendar.png */; }; + 39634C61191509A000647DAE /* 851-calendar@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C41191509A000647DAE /* 851-calendar@2x.png */; }; + 39634C62191509A000647DAE /* 852-map-selected.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C42191509A000647DAE /* 852-map-selected.png */; }; + 39634C63191509A000647DAE /* 852-map-selected@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C43191509A000647DAE /* 852-map-selected@2x.png */; }; + 39634C64191509A000647DAE /* 852-map.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C44191509A000647DAE /* 852-map.png */; }; + 39634C65191509A000647DAE /* 852-map@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C45191509A000647DAE /* 852-map@2x.png */; }; + 39634C66191509A000647DAE /* 873-magic-wand-selected.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C46191509A000647DAE /* 873-magic-wand-selected.png */; }; + 39634C67191509A000647DAE /* 873-magic-wand-selected@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C47191509A000647DAE /* 873-magic-wand-selected@2x.png */; }; + 39634C68191509A000647DAE /* 873-magic-wand.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C48191509A000647DAE /* 873-magic-wand.png */; }; + 39634C69191509A000647DAE /* 873-magic-wand@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C49191509A000647DAE /* 873-magic-wand@2x.png */; }; + 39634C6A191509A000647DAE /* 874-newspaper-selected.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C4A191509A000647DAE /* 874-newspaper-selected.png */; }; + 39634C6B191509A000647DAE /* 874-newspaper-selected@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C4B191509A000647DAE /* 874-newspaper-selected@2x.png */; }; + 39634C6C191509A000647DAE /* 874-newspaper.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C4C191509A000647DAE /* 874-newspaper.png */; }; + 39634C6D191509A000647DAE /* 874-newspaper@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C4D191509A000647DAE /* 874-newspaper@2x.png */; }; + 39634C6E191509A000647DAE /* 946-microphone-selected.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C4E191509A000647DAE /* 946-microphone-selected.png */; }; + 39634C6F191509A000647DAE /* 946-microphone-selected@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C4F191509A000647DAE /* 946-microphone-selected@2x.png */; }; + 39634C70191509A000647DAE /* 946-microphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C50191509A000647DAE /* 946-microphone.png */; }; + 39634C71191509A000647DAE /* 946-microphone@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C51191509A000647DAE /* 946-microphone@2x.png */; }; + 39634C7619150BA800647DAE /* 726-star-selected.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C7219150BA800647DAE /* 726-star-selected.png */; }; + 39634C7719150BA800647DAE /* 726-star-selected@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C7319150BA800647DAE /* 726-star-selected@2x.png */; }; + 39634C7819150BA800647DAE /* 726-star.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C7419150BA800647DAE /* 726-star.png */; }; + 39634C7919150BA800647DAE /* 726-star@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C7519150BA800647DAE /* 726-star@2x.png */; }; + 39634C7C19156F2A00647DAE /* 740-gear.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C7A19156F2A00647DAE /* 740-gear.png */; }; + 39634C7D19156F2A00647DAE /* 740-gear@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C7B19156F2A00647DAE /* 740-gear@2x.png */; }; + 39634C8019156FEF00647DAE /* 789-map-location.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C7E19156FEF00647DAE /* 789-map-location.png */; }; + 39634C8119156FEF00647DAE /* 789-map-location@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C7F19156FEF00647DAE /* 789-map-location@2x.png */; }; + 39634C84191570BE00647DAE /* 724-info.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C82191570BE00647DAE /* 724-info.png */; }; + 39634C85191570BE00647DAE /* 724-info@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C83191570BE00647DAE /* 724-info@2x.png */; }; + 39634C8E1915728100647DAE /* event_talk_new.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C8C1915728100647DAE /* event_talk_new.png */; }; + 39634C8F1915728100647DAE /* event_talk_new@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C8D1915728100647DAE /* event_talk_new@2x.png */; }; + 39634C921915739200647DAE /* event_feeding_new.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C901915739200647DAE /* event_feeding_new.png */; }; + 39634C931915739200647DAE /* event_feeding_new@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39634C911915739200647DAE /* event_feeding_new@2x.png */; }; 39650F2716839F47008EA096 /* Icon-Small.png in Resources */ = {isa = PBXBuildFile; fileRef = 39650F2516839F47008EA096 /* Icon-Small.png */; }; 39650F2816839F47008EA096 /* Icon-Small@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39650F2616839F47008EA096 /* Icon-Small@2x.png */; }; 39650F3D1684431F008EA096 /* asian_elephant_en.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 39650F291684431B008EA096 /* asian_elephant_en.m4a */; }; @@ -389,6 +438,10 @@ 398F3D51167F7B1E009FE911 /* FunAnimalImageOverlayViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 398F3D50167F7B1E009FE911 /* FunAnimalImageOverlayViewController.m */; }; 398F3D6016811056009FE911 /* SignForFreindViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 398F3D6216811056009FE911 /* SignForFreindViewController.xib */; }; 398F3D691681184F009FE911 /* SignForFriendView.m in Sources */ = {isa = PBXBuildFile; fileRef = 398F3D681681184C009FE911 /* SignForFriendView.m */; }; + 399255D51922B72A00AEC8A6 /* 747-tag.png in Resources */ = {isa = PBXBuildFile; fileRef = 399255D11922B72A00AEC8A6 /* 747-tag.png */; }; + 399255D61922B72A00AEC8A6 /* 721-bookmarks.png in Resources */ = {isa = PBXBuildFile; fileRef = 399255D21922B72A00AEC8A6 /* 721-bookmarks.png */; }; + 399255D71922B72A00AEC8A6 /* 721-bookmarks@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 399255D31922B72A00AEC8A6 /* 721-bookmarks@2x.png */; }; + 399255D81922B72A00AEC8A6 /* 747-tag@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 399255D41922B72A00AEC8A6 /* 747-tag@2x.png */; }; 39A39B86169724C500B37A06 /* MapAnnotationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 39A39B85169724C500B37A06 /* MapAnnotationView.m */; }; 39A77F6E16BD9EAA008A0A4A /* Opening-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39A77F6816BD9EAA008A0A4A /* Opening-568h@2x.png */; }; 39A77F6F16BD9EAA008A0A4A /* Opening.png in Resources */ = {isa = PBXBuildFile; fileRef = 39A77F6A16BD9EAA008A0A4A /* Opening.png */; }; @@ -605,6 +658,9 @@ 39ABE02E1677328300025349 /* Tiles in Resources */ = {isa = PBXBuildFile; fileRef = 39ABE02D1677328300025349 /* Tiles */; }; 39B0518416B5CA56004C9987 /* info_en.html in Resources */ = {isa = PBXBuildFile; fileRef = 39B0518316B5CA56004C9987 /* info_en.html */; }; 39B0518616B5CA6C004C9987 /* info_en.css in Resources */ = {isa = PBXBuildFile; fileRef = 39B0518516B5CA6C004C9987 /* info_en.css */; }; + 39BD910A192141C400F9985B /* RIButtonItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 39BD9102192141C400F9985B /* RIButtonItem.m */; }; + 39BD910B192141C400F9985B /* UIActionSheet+Blocks.m in Sources */ = {isa = PBXBuildFile; fileRef = 39BD9104192141C400F9985B /* UIActionSheet+Blocks.m */; }; + 39BD910C192141C400F9985B /* UIAlertView+Blocks.m in Sources */ = {isa = PBXBuildFile; fileRef = 39BD9106192141C400F9985B /* UIAlertView+Blocks.m */; }; 39C4AAE216D552CD00EA8848 /* SettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 39C4AAE016D552CD00EA8848 /* SettingsViewController.m */; }; 39C4AAE416D64EA500EA8848 /* SettingsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 39C4AAE616D64EA500EA8848 /* SettingsViewController.xib */; }; 39C4DB5816C31EF700ACF55F /* events.png in Resources */ = {isa = PBXBuildFile; fileRef = 39C4DB5616C31EF700ACF55F /* events.png */; }; @@ -617,6 +673,7 @@ 39C7F4DC17A82A2B00063A6F /* opening_screen_day_en@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39C7F4D817A82A2A00063A6F /* opening_screen_day_en@2x.png */; }; 39CCD3B2169306E800CBD40A /* AnimalQuestionAnswerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 39CCD3B0169306E400CBD40A /* AnimalQuestionAnswerViewController.m */; }; 39CCD3BA169437EA00CBD40A /* FunViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 39CCD3BC169437EA00CBD40A /* FunViewController.xib */; }; + 39D38E3C1923FE9B0071142B /* SendPostOrQuestionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 39D38E3B1923FE9B0071142B /* SendPostOrQuestionViewController.m */; }; 39ED9E831587AFB200C7D43D /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 39ED9E821587AFB200C7D43D /* MapKit.framework */; }; 39F89CAC16D6B21D000354D0 /* fun_camera.png in Resources */ = {isa = PBXBuildFile; fileRef = 39F89C9E16D6B21D000354D0 /* fun_camera.png */; }; 39F89CAD16D6B21D000354D0 /* fun_camera@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39F89CA016D6B21D000354D0 /* fun_camera@2x.png */; }; @@ -993,6 +1050,11 @@ 39331D94191425DD00BF550A /* EventsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventsController.h; sourceTree = ""; }; 39331D95191425DD00BF550A /* EventsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EventsController.m; sourceTree = ""; }; 3940506815B95F3300FCE4D6 /* EventKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = EventKit.framework; path = System/Library/Frameworks/EventKit.framework; sourceTree = SDKROOT; }; + 39406559192569430056D057 /* MainStoryboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MainStoryboard.storyboard; sourceTree = ""; }; + 3940655E1925F2730056D057 /* AnimalDataNewViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnimalDataNewViewController.h; sourceTree = ""; }; + 3940655F1925F2730056D057 /* AnimalDataNewViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AnimalDataNewViewController.m; sourceTree = ""; }; + 394065611925F98D0056D057 /* ViewQuestionsOrPostsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewQuestionsOrPostsViewController.h; sourceTree = ""; }; + 394065621925F98D0056D057 /* ViewQuestionsOrPostsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewQuestionsOrPostsViewController.m; sourceTree = ""; }; 394B348616766C9D0021C507 /* Accounts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accounts.framework; path = System/Library/Frameworks/Accounts.framework; sourceTree = SDKROOT; }; 394B348816766CA60021C507 /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; }; 394B348A16766CC10021C507 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; }; @@ -1002,6 +1064,52 @@ 39559476167DE0A900F3737C /* AnimalAddPostView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnimalAddPostView.h; sourceTree = ""; }; 39559477167DE0A900F3737C /* AnimalAddPostView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AnimalAddPostView.m; sourceTree = ""; }; 39579AFF158878A700DCCFD9 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; }; + 39634C32191509A000647DAE /* 704-compose-selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "704-compose-selected.png"; path = "iOS7_images/704-compose-selected.png"; sourceTree = ""; }; + 39634C33191509A000647DAE /* 704-compose-selected@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "704-compose-selected@2x.png"; path = "iOS7_images/704-compose-selected@2x.png"; sourceTree = ""; }; + 39634C34191509A000647DAE /* 704-compose.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "704-compose.png"; path = "iOS7_images/704-compose.png"; sourceTree = ""; }; + 39634C35191509A000647DAE /* 704-compose@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "704-compose@2x.png"; path = "iOS7_images/704-compose@2x.png"; sourceTree = ""; }; + 39634C36191509A000647DAE /* 714-camera-selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "714-camera-selected.png"; path = "iOS7_images/714-camera-selected.png"; sourceTree = ""; }; + 39634C37191509A000647DAE /* 714-camera-selected@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "714-camera-selected@2x.png"; path = "iOS7_images/714-camera-selected@2x.png"; sourceTree = ""; }; + 39634C38191509A000647DAE /* 714-camera.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "714-camera.png"; path = "iOS7_images/714-camera.png"; sourceTree = ""; }; + 39634C39191509A000647DAE /* 714-camera@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "714-camera@2x.png"; path = "iOS7_images/714-camera@2x.png"; sourceTree = ""; }; + 39634C3A191509A000647DAE /* 815-car-selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "815-car-selected.png"; path = "iOS7_images/815-car-selected.png"; sourceTree = ""; }; + 39634C3B191509A000647DAE /* 815-car-selected@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "815-car-selected@2x.png"; path = "iOS7_images/815-car-selected@2x.png"; sourceTree = ""; }; + 39634C3C191509A000647DAE /* 815-car.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "815-car.png"; path = "iOS7_images/815-car.png"; sourceTree = ""; }; + 39634C3D191509A000647DAE /* 815-car@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "815-car@2x.png"; path = "iOS7_images/815-car@2x.png"; sourceTree = ""; }; + 39634C3E191509A000647DAE /* 851-calendar-selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "851-calendar-selected.png"; path = "iOS7_images/851-calendar-selected.png"; sourceTree = ""; }; + 39634C3F191509A000647DAE /* 851-calendar-selected@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "851-calendar-selected@2x.png"; path = "iOS7_images/851-calendar-selected@2x.png"; sourceTree = ""; }; + 39634C40191509A000647DAE /* 851-calendar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "851-calendar.png"; path = "iOS7_images/851-calendar.png"; sourceTree = ""; }; + 39634C41191509A000647DAE /* 851-calendar@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "851-calendar@2x.png"; path = "iOS7_images/851-calendar@2x.png"; sourceTree = ""; }; + 39634C42191509A000647DAE /* 852-map-selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "852-map-selected.png"; path = "iOS7_images/852-map-selected.png"; sourceTree = ""; }; + 39634C43191509A000647DAE /* 852-map-selected@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "852-map-selected@2x.png"; path = "iOS7_images/852-map-selected@2x.png"; sourceTree = ""; }; + 39634C44191509A000647DAE /* 852-map.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "852-map.png"; path = "iOS7_images/852-map.png"; sourceTree = ""; }; + 39634C45191509A000647DAE /* 852-map@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "852-map@2x.png"; path = "iOS7_images/852-map@2x.png"; sourceTree = ""; }; + 39634C46191509A000647DAE /* 873-magic-wand-selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "873-magic-wand-selected.png"; path = "iOS7_images/873-magic-wand-selected.png"; sourceTree = ""; }; + 39634C47191509A000647DAE /* 873-magic-wand-selected@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "873-magic-wand-selected@2x.png"; path = "iOS7_images/873-magic-wand-selected@2x.png"; sourceTree = ""; }; + 39634C48191509A000647DAE /* 873-magic-wand.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "873-magic-wand.png"; path = "iOS7_images/873-magic-wand.png"; sourceTree = ""; }; + 39634C49191509A000647DAE /* 873-magic-wand@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "873-magic-wand@2x.png"; path = "iOS7_images/873-magic-wand@2x.png"; sourceTree = ""; }; + 39634C4A191509A000647DAE /* 874-newspaper-selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "874-newspaper-selected.png"; path = "iOS7_images/874-newspaper-selected.png"; sourceTree = ""; }; + 39634C4B191509A000647DAE /* 874-newspaper-selected@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "874-newspaper-selected@2x.png"; path = "iOS7_images/874-newspaper-selected@2x.png"; sourceTree = ""; }; + 39634C4C191509A000647DAE /* 874-newspaper.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "874-newspaper.png"; path = "iOS7_images/874-newspaper.png"; sourceTree = ""; }; + 39634C4D191509A000647DAE /* 874-newspaper@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "874-newspaper@2x.png"; path = "iOS7_images/874-newspaper@2x.png"; sourceTree = ""; }; + 39634C4E191509A000647DAE /* 946-microphone-selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "946-microphone-selected.png"; path = "iOS7_images/946-microphone-selected.png"; sourceTree = ""; }; + 39634C4F191509A000647DAE /* 946-microphone-selected@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "946-microphone-selected@2x.png"; path = "iOS7_images/946-microphone-selected@2x.png"; sourceTree = ""; }; + 39634C50191509A000647DAE /* 946-microphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "946-microphone.png"; path = "iOS7_images/946-microphone.png"; sourceTree = ""; }; + 39634C51191509A000647DAE /* 946-microphone@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "946-microphone@2x.png"; path = "iOS7_images/946-microphone@2x.png"; sourceTree = ""; }; + 39634C7219150BA800647DAE /* 726-star-selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "726-star-selected.png"; sourceTree = ""; }; + 39634C7319150BA800647DAE /* 726-star-selected@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "726-star-selected@2x.png"; sourceTree = ""; }; + 39634C7419150BA800647DAE /* 726-star.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "726-star.png"; sourceTree = ""; }; + 39634C7519150BA800647DAE /* 726-star@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "726-star@2x.png"; sourceTree = ""; }; + 39634C7A19156F2A00647DAE /* 740-gear.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "740-gear.png"; sourceTree = ""; }; + 39634C7B19156F2A00647DAE /* 740-gear@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "740-gear@2x.png"; sourceTree = ""; }; + 39634C7E19156FEF00647DAE /* 789-map-location.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "789-map-location.png"; sourceTree = ""; }; + 39634C7F19156FEF00647DAE /* 789-map-location@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "789-map-location@2x.png"; sourceTree = ""; }; + 39634C82191570BE00647DAE /* 724-info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "724-info.png"; sourceTree = ""; }; + 39634C83191570BE00647DAE /* 724-info@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "724-info@2x.png"; sourceTree = ""; }; + 39634C8C1915728100647DAE /* event_talk_new.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = event_talk_new.png; sourceTree = ""; }; + 39634C8D1915728100647DAE /* event_talk_new@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "event_talk_new@2x.png"; sourceTree = ""; }; + 39634C901915739200647DAE /* event_feeding_new.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = event_feeding_new.png; sourceTree = ""; }; + 39634C911915739200647DAE /* event_feeding_new@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "event_feeding_new@2x.png"; sourceTree = ""; }; 39650F2516839F47008EA096 /* Icon-Small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-Small.png"; path = "../Icon-Small.png"; sourceTree = ""; }; 39650F2616839F47008EA096 /* Icon-Small@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-Small@2x.png"; path = "../Icon-Small@2x.png"; sourceTree = ""; }; 39650F291684431B008EA096 /* asian_elephant_en.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = asian_elephant_en.m4a; path = "zoo guides/asian_elephant_en.m4a"; sourceTree = SOURCE_ROOT; }; @@ -1051,6 +1159,10 @@ 398F3D6316811061009FE911 /* he */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = he; path = he.lproj/SignForFreindViewController.xib; sourceTree = ""; }; 398F3D671681184A009FE911 /* SignForFriendView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SignForFriendView.h; sourceTree = ""; }; 398F3D681681184C009FE911 /* SignForFriendView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SignForFriendView.m; sourceTree = ""; }; + 399255D11922B72A00AEC8A6 /* 747-tag.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "747-tag.png"; sourceTree = ""; }; + 399255D21922B72A00AEC8A6 /* 721-bookmarks.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "721-bookmarks.png"; sourceTree = ""; }; + 399255D31922B72A00AEC8A6 /* 721-bookmarks@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "721-bookmarks@2x.png"; sourceTree = ""; }; + 399255D41922B72A00AEC8A6 /* 747-tag@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "747-tag@2x.png"; sourceTree = ""; }; 39A39B84169724C500B37A06 /* MapAnnotationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapAnnotationView.h; sourceTree = ""; }; 39A39B85169724C500B37A06 /* MapAnnotationView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MapAnnotationView.m; sourceTree = ""; }; 39A77F6916BD9EAA008A0A4A /* en */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = en; path = "en.lproj/Opening-568h@2x.png"; sourceTree = ""; }; @@ -1381,6 +1493,12 @@ 39ABE02D1677328300025349 /* Tiles */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Tiles; sourceTree = SOURCE_ROOT; }; 39B0518316B5CA56004C9987 /* info_en.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = info_en.html; sourceTree = SOURCE_ROOT; }; 39B0518516B5CA6C004C9987 /* info_en.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = info_en.css; sourceTree = SOURCE_ROOT; }; + 39BD9101192141C400F9985B /* RIButtonItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RIButtonItem.h; sourceTree = ""; }; + 39BD9102192141C400F9985B /* RIButtonItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RIButtonItem.m; sourceTree = ""; }; + 39BD9103192141C400F9985B /* UIActionSheet+Blocks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIActionSheet+Blocks.h"; sourceTree = ""; }; + 39BD9104192141C400F9985B /* UIActionSheet+Blocks.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIActionSheet+Blocks.m"; sourceTree = ""; }; + 39BD9105192141C400F9985B /* UIAlertView+Blocks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIAlertView+Blocks.h"; sourceTree = ""; }; + 39BD9106192141C400F9985B /* UIAlertView+Blocks.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIAlertView+Blocks.m"; sourceTree = ""; }; 39C4AADF16D552CD00EA8848 /* SettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsViewController.h; sourceTree = ""; }; 39C4AAE016D552CD00EA8848 /* SettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SettingsViewController.m; sourceTree = ""; }; 39C4AAE516D64EA500EA8848 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/SettingsViewController.xib; sourceTree = ""; }; @@ -1398,6 +1516,8 @@ 39CCD3B0169306E400CBD40A /* AnimalQuestionAnswerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AnimalQuestionAnswerViewController.m; sourceTree = ""; }; 39CCD3BB169437EA00CBD40A /* he */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = he; path = he.lproj/FunViewController.xib; sourceTree = ""; }; 39CCD3BD169437EE00CBD40A /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/FunViewController.xib; sourceTree = ""; }; + 39D38E3A1923FE9B0071142B /* SendPostOrQuestionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SendPostOrQuestionViewController.h; sourceTree = ""; }; + 39D38E3B1923FE9B0071142B /* SendPostOrQuestionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SendPostOrQuestionViewController.m; sourceTree = ""; }; 39ED9E821587AFB200C7D43D /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; }; 39F89C9F16D6B21D000354D0 /* en */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = en; path = en.lproj/fun_camera.png; sourceTree = SOURCE_ROOT; }; 39F89CA116D6B21D000354D0 /* en */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = en; path = "en.lproj/fun_camera@2x.png"; sourceTree = SOURCE_ROOT; }; @@ -1495,6 +1615,13 @@ 09ABC06213A1D52D009C3FCF = { isa = PBXGroup; children = ( + 39406559192569430056D057 /* MainStoryboard.storyboard */, + 394065611925F98D0056D057 /* ViewQuestionsOrPostsViewController.h */, + 394065621925F98D0056D057 /* ViewQuestionsOrPostsViewController.m */, + 3940655E1925F2730056D057 /* AnimalDataNewViewController.h */, + 3940655F1925F2730056D057 /* AnimalDataNewViewController.m */, + 39D38E3A1923FE9B0071142B /* SendPostOrQuestionViewController.h */, + 39D38E3B1923FE9B0071142B /* SendPostOrQuestionViewController.m */, 390C208217A927BE00D85954 /* BugSense-iOS.framework */, 39A77F6816BD9EAA008A0A4A /* Opening-568h@2x.png */, 39A77F6A16BD9EAA008A0A4A /* Opening.png */, @@ -1761,6 +1888,63 @@ name = "audio guides"; sourceTree = ""; }; + 39816B111915091600052AE7 /* ios7_images */ = { + isa = PBXGroup; + children = ( + 399255D11922B72A00AEC8A6 /* 747-tag.png */, + 399255D21922B72A00AEC8A6 /* 721-bookmarks.png */, + 399255D31922B72A00AEC8A6 /* 721-bookmarks@2x.png */, + 399255D41922B72A00AEC8A6 /* 747-tag@2x.png */, + 39634C901915739200647DAE /* event_feeding_new.png */, + 39634C911915739200647DAE /* event_feeding_new@2x.png */, + 39634C8C1915728100647DAE /* event_talk_new.png */, + 39634C8D1915728100647DAE /* event_talk_new@2x.png */, + 39634C82191570BE00647DAE /* 724-info.png */, + 39634C83191570BE00647DAE /* 724-info@2x.png */, + 39634C7E19156FEF00647DAE /* 789-map-location.png */, + 39634C7F19156FEF00647DAE /* 789-map-location@2x.png */, + 39634C7A19156F2A00647DAE /* 740-gear.png */, + 39634C7B19156F2A00647DAE /* 740-gear@2x.png */, + 39634C7219150BA800647DAE /* 726-star-selected.png */, + 39634C7319150BA800647DAE /* 726-star-selected@2x.png */, + 39634C7419150BA800647DAE /* 726-star.png */, + 39634C7519150BA800647DAE /* 726-star@2x.png */, + 39634C32191509A000647DAE /* 704-compose-selected.png */, + 39634C33191509A000647DAE /* 704-compose-selected@2x.png */, + 39634C34191509A000647DAE /* 704-compose.png */, + 39634C35191509A000647DAE /* 704-compose@2x.png */, + 39634C36191509A000647DAE /* 714-camera-selected.png */, + 39634C37191509A000647DAE /* 714-camera-selected@2x.png */, + 39634C38191509A000647DAE /* 714-camera.png */, + 39634C39191509A000647DAE /* 714-camera@2x.png */, + 39634C3A191509A000647DAE /* 815-car-selected.png */, + 39634C3B191509A000647DAE /* 815-car-selected@2x.png */, + 39634C3C191509A000647DAE /* 815-car.png */, + 39634C3D191509A000647DAE /* 815-car@2x.png */, + 39634C3E191509A000647DAE /* 851-calendar-selected.png */, + 39634C3F191509A000647DAE /* 851-calendar-selected@2x.png */, + 39634C40191509A000647DAE /* 851-calendar.png */, + 39634C41191509A000647DAE /* 851-calendar@2x.png */, + 39634C42191509A000647DAE /* 852-map-selected.png */, + 39634C43191509A000647DAE /* 852-map-selected@2x.png */, + 39634C44191509A000647DAE /* 852-map.png */, + 39634C45191509A000647DAE /* 852-map@2x.png */, + 39634C46191509A000647DAE /* 873-magic-wand-selected.png */, + 39634C47191509A000647DAE /* 873-magic-wand-selected@2x.png */, + 39634C48191509A000647DAE /* 873-magic-wand.png */, + 39634C49191509A000647DAE /* 873-magic-wand@2x.png */, + 39634C4A191509A000647DAE /* 874-newspaper-selected.png */, + 39634C4B191509A000647DAE /* 874-newspaper-selected@2x.png */, + 39634C4C191509A000647DAE /* 874-newspaper.png */, + 39634C4D191509A000647DAE /* 874-newspaper@2x.png */, + 39634C4E191509A000647DAE /* 946-microphone-selected.png */, + 39634C4F191509A000647DAE /* 946-microphone-selected@2x.png */, + 39634C50191509A000647DAE /* 946-microphone.png */, + 39634C51191509A000647DAE /* 946-microphone@2x.png */, + ); + name = ios7_images; + sourceTree = ""; + }; 398A1AD11589C5CD005FBA99 /* events icons */ = { isa = PBXGroup; children = ( @@ -1840,6 +2024,7 @@ 39ABDE7A16772BA800025349 /* Extaernal */ = { isa = PBXGroup; children = ( + 39BD90FE192141C400F9985B /* UIAlertView-Blocks */, 39331D871914155B00BF550A /* MXLCalendarManager */, 39A94B031677BB96008A9CF6 /* LBYouTubeView */, 39ABDE7B16772BA800025349 /* CGICalendar */, @@ -2001,6 +2186,7 @@ 39ABDFAB16772C2D00025349 /* UI images */ = { isa = PBXGroup; children = ( + 39816B111915091600052AE7 /* ios7_images */, 390C207217A8434A00D85954 /* 001-Home.png */, 390C207317A8434A00D85954 /* 001-Home@2x.png */, 39C7F4D317A7F47700063A6F /* nav_pattern_baje.png */, @@ -2428,6 +2614,19 @@ path = "Final resize zoo images"; sourceTree = SOURCE_ROOT; }; + 39BD90FE192141C400F9985B /* UIAlertView-Blocks */ = { + isa = PBXGroup; + children = ( + 39BD9101192141C400F9985B /* RIButtonItem.h */, + 39BD9102192141C400F9985B /* RIButtonItem.m */, + 39BD9103192141C400F9985B /* UIActionSheet+Blocks.h */, + 39BD9104192141C400F9985B /* UIActionSheet+Blocks.m */, + 39BD9105192141C400F9985B /* UIAlertView+Blocks.h */, + 39BD9106192141C400F9985B /* UIAlertView+Blocks.m */, + ); + path = "UIAlertView-Blocks"; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -2455,6 +2654,11 @@ isa = PBXProject; attributes = { LastUpgradeCheck = 0510; + TargetAttributes = { + 09ABC06C13A1D52D009C3FCF = { + DevelopmentTeam = J8H6BGY3VL; + }; + }; }; buildConfigurationList = 09ABC06713A1D52D009C3FCF /* Build configuration list for PBXProject "JerusalemBiblicalZoo" */; compatibilityVersion = "Xcode 3.2"; @@ -2482,6 +2686,7 @@ files = ( 398A1AEC1589C5CD005FBA99 /* event_feeding@2x.png in Resources */, 398A1AEF1589C5CD005FBA99 /* event_feeding_small@2x.png in Resources */, + 39634C70191509A000647DAE /* 946-microphone.png in Resources */, 398A1AF11589C5CD005FBA99 /* event_kids@2x.png in Resources */, 398A1AF41589C5CD005FBA99 /* event_kids_small@2x.png in Resources */, 398A1AF61589C5CD005FBA99 /* event_music@2x.png in Resources */, @@ -2489,6 +2694,7 @@ 398A1AFB1589C5CD005FBA99 /* event_special@2x.png in Resources */, 398A1AFE1589C5CD005FBA99 /* event_special_small@2x.png in Resources */, 398A1B001589C5CD005FBA99 /* event_talk@2x.png in Resources */, + 39634C62191509A000647DAE /* 852-map-selected.png in Resources */, 398A1B031589C5CD005FBA99 /* event_talk_small@2x.png in Resources */, 3902F05E15AB6CFB002517C5 /* Localizable.strings in Resources */, 3902F06315AB6D0E002517C5 /* InfoPlist.strings in Resources */, @@ -2500,11 +2706,15 @@ 39ABE01216772C7700025349 /* EventDetailsViewController.xib in Resources */, 39ABE01416772C7700025349 /* OpeningScreenViewController.xib in Resources */, 398F3D6016811056009FE911 /* SignForFreindViewController.xib in Resources */, + 39634C71191509A000647DAE /* 946-microphone@2x.png in Resources */, 39ABE02C1677326100025349 /* MainWindow.xib in Resources */, 39ABE02E1677328300025349 /* Tiles in Resources */, 392CB4DD16791A8B005A1E8C /* JerusalemBiblicalZooSeed.sqlite in Resources */, + 39634C7919150BA800647DAE /* 726-star@2x.png in Resources */, 3906EE8A167A089200108162 /* style-news.css in Resources */, + 39634C69191509A000647DAE /* 873-magic-wand@2x.png in Resources */, 3906EE8B167A089200108162 /* style.css in Resources */, + 39634C57191509A000647DAE /* 714-camera-selected@2x.png in Resources */, 39650F2716839F47008EA096 /* Icon-Small.png in Resources */, 39650F2816839F47008EA096 /* Icon-Small@2x.png in Resources */, 39650F3D1684431F008EA096 /* asian_elephant_en.m4a in Resources */, @@ -2516,6 +2726,7 @@ 39650F431684431F008EA096 /* chimpanzee_en.m4a in Resources */, 39650F441684431F008EA096 /* chimpanzee_he.m4a in Resources */, 39650F451684431F008EA096 /* golden_lion_tamarin_en.m4a in Resources */, + 399255D81922B72A00AEC8A6 /* 747-tag@2x.png in Resources */, 39650F461684431F008EA096 /* golden_lion_tamarin_he.m4a in Resources */, 39650F471684431F008EA096 /* griffon_vulture_en.m4a in Resources */, 39650F481684431F008EA096 /* griffon_vulture_he.m4a in Resources */, @@ -2539,11 +2750,14 @@ 39A77F7916BDA0E8008A0A4A /* Icon-72.png in Resources */, 39A77F7A16BDA0E8008A0A4A /* Icon-72@2x.png in Resources */, 39A77F7B16BDA0E8008A0A4A /* Icon-Small-50.png in Resources */, + 399255D51922B72A00AEC8A6 /* 747-tag.png in Resources */, 39A77FEF16BE865C008A0A4A /* 056-PlusCircle.png in Resources */, 39A77FF016BE865C008A0A4A /* 056-PlusCircle@2x.png in Resources */, 39A77FF116BE865C008A0A4A /* 088-Map_brown_bg.png in Resources */, 39A77FF216BE865C008A0A4A /* 088-Map_brown_bg@2x.png in Resources */, + 39634C59191509A000647DAE /* 714-camera@2x.png in Resources */, 39A77FF316BE865C008A0A4A /* 088-Map_white.png in Resources */, + 39634C68191509A000647DAE /* 873-magic-wand.png in Resources */, 39A77FF416BE865C008A0A4A /* 088-Map_white@2x.png in Resources */, 39A77FF516BE865C008A0A4A /* 088-Map.png in Resources */, 39A77FF616BE865C008A0A4A /* 088-Map@2x.png in Resources */, @@ -2555,6 +2769,7 @@ 39A77FFE16BE865C008A0A4A /* 155-Revert@2x.png in Resources */, 39A77FFF16BE865C008A0A4A /* 156-Cycle.png in Resources */, 39A7800016BE865C008A0A4A /* 156-Cycle@2x.png in Resources */, + 39634C61191509A000647DAE /* 851-calendar@2x.png in Resources */, 39A7800116BE865C008A0A4A /* 248-QuestionCircleAlt_2.png in Resources */, 39A7800216BE865C008A0A4A /* 248-QuestionCircleAlt_2@2x.png in Resources */, 39A7800316BE865C008A0A4A /* 248-QuestionCircleAlt.png in Resources */, @@ -2572,6 +2787,7 @@ 39A7801116BE865C008A0A4A /* audioGuide.png in Resources */, 39A7801216BE865C008A0A4A /* audioGuide@2x.png in Resources */, 39A7801716BE865C008A0A4A /* conservation-indicator.png in Resources */, + 39634C6D191509A000647DAE /* 874-newspaper@2x.png in Resources */, 39A7801816BE865C008A0A4A /* conservation-indicator@2x.png in Resources */, 39A7801916BE865C008A0A4A /* data.png in Resources */, 39A7801A16BE865C008A0A4A /* data@2x.png in Resources */, @@ -2601,6 +2817,7 @@ 39A7803816BE865C008A0A4A /* opening_screen_night_en.png in Resources */, 39A7803916BE865C008A0A4A /* opening_screen_night_en@2x.png in Resources */, 39A7803A16BE865C008A0A4A /* opening_screen_night_he_5@2x.png in Resources */, + 39634C7819150BA800647DAE /* 726-star.png in Resources */, 39A7803B16BE865C008A0A4A /* opening_screen_night_he.png in Resources */, 39A7803C16BE865C008A0A4A /* opening_screen_night_he@2x.png in Resources */, 39A7803D16BE865C008A0A4A /* pencil.png in Resources */, @@ -2648,10 +2865,14 @@ 39F89CBD16D6B22F000354D0 /* camera@2x.png in Resources */, 39F89CC416D6B2E6000354D0 /* facebook_icon.png in Resources */, 39F89CC516D6B2E6000354D0 /* facebook_icon@2x.png in Resources */, + 3940655A192569430056D057 /* MainStoryboard.storyboard in Resources */, 39F89CD916D6B4AB000354D0 /* 011-Phone.png in Resources */, + 39634C8E1915728100647DAE /* event_talk_new.png in Resources */, + 39634C6C191509A000647DAE /* 874-newspaper.png in Resources */, 39F89CDA16D6B4AB000354D0 /* 011-Phone@2x.png in Resources */, 39F89CDB16D6B4AB000354D0 /* 013-Alram.png in Resources */, 39F89CDC16D6B4AB000354D0 /* 013-Alram@2x.png in Resources */, + 39634C67191509A000647DAE /* 873-magic-wand-selected@2x.png in Resources */, 39F89CDD16D6B4AB000354D0 /* 099-Share.png in Resources */, 39F89CDE16D6B4AB000354D0 /* 099-Share@2x.png in Resources */, 39F89CDF16D6B4AB000354D0 /* 277-MultiplyCircle.png in Resources */, @@ -2668,11 +2889,14 @@ 3900F04516E241DB00C7AAEA /* african_spurred_tortise_2@2x.jpg in Resources */, 3900F04616E241DB00C7AAEA /* agouti_1@2x.jpg in Resources */, 3900F04716E241DB00C7AAEA /* agouti_2@2x.jpg in Resources */, + 39634C6B191509A000647DAE /* 874-newspaper-selected@2x.png in Resources */, 3900F04816E241DB00C7AAEA /* agouti_3@2x.jpg in Resources */, 3900F04916E241DB00C7AAEA /* alpaca_1@2x.jpg in Resources */, 3900F04A16E241DB00C7AAEA /* alpaca_2@2x.jpg in Resources */, 3900F04B16E241DB00C7AAEA /* alpaca_3@2x.jpg in Resources */, 3900F04C16E241DB00C7AAEA /* arabian_oryx_1@2x.jpg in Resources */, + 39634C84191570BE00647DAE /* 724-info.png in Resources */, + 39634C5A191509A000647DAE /* 815-car-selected.png in Resources */, 3900F04D16E241DB00C7AAEA /* arabian_oryx_2@2x.jpg in Resources */, 3900F04E16E241DB00C7AAEA /* arabian_oryx_3@2x.jpg in Resources */, 3900F04F16E241DB00C7AAEA /* argentine_black_and_white_tegu_1@2x.jpg in Resources */, @@ -2684,10 +2908,16 @@ 3900F05516E241DB00C7AAEA /* arrmadillo_3@2x.jpg in Resources */, 3900F05616E241DB00C7AAEA /* asian_elephant_1@2x.jpg in Resources */, 3900F05716E241DB00C7AAEA /* asian_elephant_2@2x.jpg in Resources */, + 39634C85191570BE00647DAE /* 724-info@2x.png in Resources */, + 39634C66191509A000647DAE /* 873-magic-wand-selected.png in Resources */, 3900F05816E241DB00C7AAEA /* asian_lion_1@2x.jpg in Resources */, + 39634C5F191509A000647DAE /* 851-calendar-selected@2x.png in Resources */, + 39634C55191509A000647DAE /* 704-compose@2x.png in Resources */, + 39634C7719150BA800647DAE /* 726-star-selected@2x.png in Resources */, 3900F05916E241DB00C7AAEA /* asian_lion_2@2x.jpg in Resources */, 3900F05A16E241DB00C7AAEA /* asian_lion_3@2x.jpg in Resources */, 3900F05B16E241DB00C7AAEA /* asian_lion_4@2x.jpg in Resources */, + 39634C64191509A000647DAE /* 852-map.png in Resources */, 3900F05C16E241DB00C7AAEA /* bayit_hai_1@2x.jpg in Resources */, 3900F05D16E241DB00C7AAEA /* bayit_hai_2@2x.jpg in Resources */, 3900F05E16E241DB00C7AAEA /* bayit_hai_3@2x.jpg in Resources */, @@ -2695,6 +2925,7 @@ 3900F06016E241DB00C7AAEA /* bayit_hai_5@2x.jpg in Resources */, 3900F06116E241DB00C7AAEA /* black_footed_penguin_1@2x.jpg in Resources */, 3900F06216E241DB00C7AAEA /* black_footed_penguin_2@2x.jpg in Resources */, + 39634C5C191509A000647DAE /* 815-car.png in Resources */, 3900F06316E241DB00C7AAEA /* black_footed_penguin_3@2x.jpg in Resources */, 3900F06416E241DB00C7AAEA /* black_footed_penguin_4@2x.jpg in Resources */, 3900F06516E241DB00C7AAEA /* black_howler_monkey_1@2x.jpg in Resources */, @@ -2704,6 +2935,7 @@ 3900F06916E241DB00C7AAEA /* black_lemur_1@2x.jpg in Resources */, 3900F06A16E241DB00C7AAEA /* black_lemur_2@2x.jpg in Resources */, 3900F06B16E241DB00C7AAEA /* black_lemur_3@2x.jpg in Resources */, + 39634C60191509A000647DAE /* 851-calendar.png in Resources */, 3900F06C16E241DB00C7AAEA /* black_tailed_prairie_dog_1@2x.jpg in Resources */, 3900F06D16E241DB00C7AAEA /* black_tailed_prairie_dog_2@2x.jpg in Resources */, 3900F06E16E241DB00C7AAEA /* bonellis_eagle _2@2x.jpg in Resources */, @@ -2723,9 +2955,11 @@ 3900F07C16E241DB00C7AAEA /* capybara_2@2x.jpg in Resources */, 3900F07D16E241DB00C7AAEA /* capybara_3@2x.jpg in Resources */, 3900F07E16E241DB00C7AAEA /* cheetah_1@2x.jpg in Resources */, + 39634C921915739200647DAE /* event_feeding_new.png in Resources */, 3900F07F16E241DB00C7AAEA /* cheetah_2@2x.jpg in Resources */, 3900F08016E241DB00C7AAEA /* cheetah_3@2x.jpg in Resources */, 3900F08116E241DB00C7AAEA /* chicken_1@2x.jpg in Resources */, + 39634C7619150BA800647DAE /* 726-star-selected.png in Resources */, 3900F08216E241DB00C7AAEA /* chicken_2@2x.jpg in Resources */, 3900F08316E241DB00C7AAEA /* chicken_3@2x.jpg in Resources */, 3900F08416E241DB00C7AAEA /* children's_zoo_1@2x.jpg in Resources */, @@ -2735,11 +2969,15 @@ 3900F08816E241DB00C7AAEA /* chimpanzee_1@2x.jpg in Resources */, 3900F08916E241DB00C7AAEA /* chimpanzee_2@2x.jpg in Resources */, 3900F08A16E241DB00C7AAEA /* chimpanzee_3@2x.jpg in Resources */, + 39634C65191509A000647DAE /* 852-map@2x.png in Resources */, + 39634C931915739200647DAE /* event_feeding_new@2x.png in Resources */, 3900F08B16E241DB00C7AAEA /* coin_snake_1@2x.jpg in Resources */, 3900F08C16E241DB00C7AAEA /* coin_snake_2@2x.jpg in Resources */, + 39634C5B191509A000647DAE /* 815-car-selected@2x.png in Resources */, 3900F08D16E241DB00C7AAEA /* collared_peccary_1@2x.jpg in Resources */, 3900F08E16E241DB00C7AAEA /* collared_peccary_2@2x.jpg in Resources */, 3900F08F16E241DB00C7AAEA /* collared_peccary_3@2x.jpg in Resources */, + 39634C8F1915728100647DAE /* event_talk_new@2x.png in Resources */, 3900F09016E241DB00C7AAEA /* common_chameleon_1@2x.jpg in Resources */, 3900F09116E241DB00C7AAEA /* common_chameleon_2@2x.jpg in Resources */, 3900F09216E241DB00C7AAEA /* common_chameleon_3@2x.jpg in Resources */, @@ -2750,11 +2988,13 @@ 3900F09716E241DB00C7AAEA /* common_squirrel_monkey_2@2x.jpg in Resources */, 3900F09816E241DB00C7AAEA /* common_squirrel_monkey_3@2x.jpg in Resources */, 3900F09916E241DB00C7AAEA /* common_squirrel_monkey_4@2x.jpg in Resources */, + 39634C7C19156F2A00647DAE /* 740-gear.png in Resources */, 3900F09A16E241DB00C7AAEA /* common_zebra_1@2x.jpg in Resources */, 3900F09B16E241DB00C7AAEA /* common_zebra_2@2x.jpg in Resources */, 3900F09C16E241DB00C7AAEA /* common_zebra_3@2x.jpg in Resources */, 3900F09D16E241DB00C7AAEA /* crowned_crane_1@2x.jpg in Resources */, 3900F09E16E241DB00C7AAEA /* crowned_crane_2@2x.jpg in Resources */, + 39634C7D19156F2A00647DAE /* 740-gear@2x.png in Resources */, 3900F09F16E241DB00C7AAEA /* crowned_crane_3@2x.jpg in Resources */, 3900F0A016E241DB00C7AAEA /* desert_cobra_1@2x.jpg in Resources */, 3900F0A116E241DB00C7AAEA /* desert_cobra_2@2x.jpg in Resources */, @@ -2764,6 +3004,7 @@ 3900F0A516E241DB00C7AAEA /* diadem_snake_3@2x.jpg in Resources */, 3900F0A616E241DB00C7AAEA /* donkey_3@2x.jpg in Resources */, 3900F0A716E241DB00C7AAEA /* double-wattled_cassowary_1@2x.jpg in Resources */, + 399255D71922B72A00AEC8A6 /* 721-bookmarks@2x.png in Resources */, 3900F0A816E241DB00C7AAEA /* double-wattled_cassowary_2@2x.jpg in Resources */, 3900F0A916E241DB00C7AAEA /* double-wattled_cassowary_3@2x.jpg in Resources */, 3900F0AA16E241DB00C7AAEA /* double-wattled_cassowary_4@2x.jpg in Resources */, @@ -2777,6 +3018,7 @@ 3900F0B216E241DB00C7AAEA /* eurasian_eagle_owl_1@2x.jpg in Resources */, 3900F0B316E241DB00C7AAEA /* eurasian_eagle_owl_2@2x.jpg in Resources */, 3900F0B416E241DB00C7AAEA /* eurasian_eagle_owl_3@2x.jpg in Resources */, + 39634C5E191509A000647DAE /* 851-calendar-selected.png in Resources */, 3900F0B516E241DB00C7AAEA /* eurasian_otter_1@2x.jpg in Resources */, 3900F0B616E241DB00C7AAEA /* eurasian_otter_2@2x.jpg in Resources */, 3900F0B716E241DB00C7AAEA /* european_honey_buzzard_1@2x.jpg in Resources */, @@ -2803,6 +3045,7 @@ 3900F0CC16E241DB00C7AAEA /* golden_lion_tamarin_3@2x.jpg in Resources */, 3900F0CD16E241DB00C7AAEA /* golden_lion_tamarin_4@2x.jpg in Resources */, 3900F0CE16E241DB00C7AAEA /* golden_spiny_mouse_1@2x.jpg in Resources */, + 39634C8019156FEF00647DAE /* 789-map-location.png in Resources */, 3900F0CF16E241DB00C7AAEA /* golden_spiny_mouse_2@2x.jpg in Resources */, 3900F0D016E241DB00C7AAEA /* golden_spiny_mouse_3@2x.jpg in Resources */, 3900F0D116E241DB00C7AAEA /* great_cormorant_1@2x.jpg in Resources */, @@ -2811,12 +3054,14 @@ 3900F0D416E241DB00C7AAEA /* greater_flamingo_1@2x.jpg in Resources */, 3900F0D516E241DB00C7AAEA /* greater_flamingo_2@2x.jpg in Resources */, 3900F0D616E241DB00C7AAEA /* greater_flamingo_3@2x.jpg in Resources */, + 39634C58191509A000647DAE /* 714-camera.png in Resources */, 3900F0D716E241DB00C7AAEA /* green_basilisk_1@2x.jpg in Resources */, 3900F0D816E241DB00C7AAEA /* green_basilisk_2@2x.jpg in Resources */, 3900F0D916E241DB00C7AAEA /* green_tree_python_1@2x.jpg in Resources */, 3900F0DA16E241DB00C7AAEA /* green_tree_python_2@2x.jpg in Resources */, 3900F0DB16E241DB00C7AAEA /* grey_cheeked_hornbill_1@2x.jpg in Resources */, 3900F0DC16E241DB00C7AAEA /* grey_cheeked_hornbill_2@2x.jpg in Resources */, + 39634C54191509A000647DAE /* 704-compose.png in Resources */, 3900F0DD16E241DB00C7AAEA /* grey_cheeked_hornbill_3@2x.jpg in Resources */, 3900F0DE16E241DB00C7AAEA /* grey_headed_fruit_bat_1@2x.jpg in Resources */, 3900F0DF16E241DB00C7AAEA /* grey_headed_fruit_bat_2@2x.jpg in Resources */, @@ -2879,6 +3124,7 @@ 3900F11816E241DB00C7AAEA /* persian_leopard_2@2x.jpg in Resources */, 3900F11916E241DB00C7AAEA /* pony_1@2x.jpg in Resources */, 3900F11A16E241DB00C7AAEA /* pony_2@2x.jpg in Resources */, + 39634C6F191509A000647DAE /* 946-microphone-selected@2x.png in Resources */, 3900F11B16E241DB00C7AAEA /* pygmy_marmoset_1@2x.jpg in Resources */, 3900F11C16E241DB00C7AAEA /* pygmy_marmoset_2@2x.jpg in Resources */, 3900F11D16E241DB00C7AAEA /* rabbit_1@2x.jpg in Resources */, @@ -2909,8 +3155,10 @@ 3900F13616E241DB00C7AAEA /* serval_1@2x.jpg in Resources */, 3900F13716E241DB00C7AAEA /* serval_2@2x.jpg in Resources */, 3900F13816E241DB00C7AAEA /* sheep_2@2x.jpg in Resources */, + 39634C8119156FEF00647DAE /* 789-map-location@2x.png in Resources */, 3900F13916E241DB00C7AAEA /* sheep_3@2x.jpg in Resources */, 3900F13A16E241DB00C7AAEA /* short_clawed_otter_1@2x.jpg in Resources */, + 39634C56191509A000647DAE /* 714-camera-selected.png in Resources */, 3900F13B16E241DB00C7AAEA /* short_clawed_otter_2@2x.jpg in Resources */, 3900F13C16E241DB00C7AAEA /* short_toed_eagle_1@2x.jpg in Resources */, 3900F13D16E241DB00C7AAEA /* short_toed_eagle_2@2x.jpg in Resources */, @@ -2920,16 +3168,20 @@ 3900F14116E241DB00C7AAEA /* south_african_giraffe_1@2x.jpg in Resources */, 3900F14216E241DB00C7AAEA /* south_african_giraffe_2@2x.jpg in Resources */, 3900F14316E241DB00C7AAEA /* south_african_giraffe_3@2x.jpg in Resources */, + 39634C63191509A000647DAE /* 852-map-selected@2x.png in Resources */, 3900F14416E241DB00C7AAEA /* south_african_giraffe_4@2x.jpg in Resources */, 3900F14516E241DB00C7AAEA /* spider_monkey_1@2x.jpg in Resources */, 3900F14616E241DB00C7AAEA /* spider_monkey_2@2x.jpg in Resources */, 3900F14716E241DB00C7AAEA /* spider_monkey_3@2x.jpg in Resources */, + 399255D61922B72A00AEC8A6 /* 721-bookmarks.png in Resources */, 3900F14816E241DB00C7AAEA /* sumatran_tiger_1@2x.jpg in Resources */, 3900F14916E241DB00C7AAEA /* sumatran_tiger_2@2x.jpg in Resources */, 3900F14A16E241DB00C7AAEA /* sumatran_tiger_3@2x.jpg in Resources */, 3900F14B16E241DB00C7AAEA /* syrian_brown_bear_1@2x.jpg in Resources */, 3900F14C16E241DB00C7AAEA /* syrian_brown_bear_2@2x.jpg in Resources */, + 39634C52191509A000647DAE /* 704-compose-selected.png in Resources */, 3900F14D16E241DB00C7AAEA /* syrian_brown_bear_3@2x.jpg in Resources */, + 39634C6E191509A000647DAE /* 946-microphone-selected.png in Resources */, 3900F14E16E241DB00C7AAEA /* syrian_brown_bear_4@2x.jpg in Resources */, 3900F14F16E241DB00C7AAEA /* syrian_brown_bear_5@2x.jpg in Resources */, 3900F15016E241DB00C7AAEA /* syrian_brown_bear_6@2x.jpg in Resources */, @@ -2945,6 +3197,7 @@ 3900F15A16E241DB00C7AAEA /* wet_side_story_3@2x.jpg in Resources */, 3900F15B16E241DB00C7AAEA /* wet_side_story_4@2x.jpg in Resources */, 3900F15C16E241DB00C7AAEA /* wet_side_story_5@2x.jpg in Resources */, + 39634C53191509A000647DAE /* 704-compose-selected@2x.png in Resources */, 3900F15D16E241DB00C7AAEA /* wet_side_story_6@2x.jpg in Resources */, 3900F15E16E241DB00C7AAEA /* wet_side_story_7@2x.jpg in Resources */, 3900F15F16E241DB00C7AAEA /* white_pelican_1@2x.jpg in Resources */, @@ -2955,6 +3208,7 @@ 3900F16416E241DB00C7AAEA /* wild_sheep_miriam_kishnevski@2x.jpg in Resources */, 3900F16516E241DB00C7AAEA /* xenopus_frog_1@2x.jpg in Resources */, 3900F16616E241DB00C7AAEA /* xenopus_frog_2@2x.jpg in Resources */, + 39634C6A191509A000647DAE /* 874-newspaper-selected.png in Resources */, 3900F16716E241DB00C7AAEA /* xenopus_frog_3@2x.jpg in Resources */, 3900F16816E241DB00C7AAEA /* yellow_striped_poison_dart_frog_1@2x.jpg in Resources */, 39C7F4D417A7F47700063A6F /* nav_pattern_baje.png in Resources */, @@ -2965,6 +3219,7 @@ 390C207417A8434A00D85954 /* 001-Home.png in Resources */, 390C207517A8434A00D85954 /* 001-Home@2x.png in Resources */, 390C207817A8454A00D85954 /* postCellIcon.png in Resources */, + 39634C5D191509A000647DAE /* 815-car@2x.png in Resources */, 390C207917A8454A00D85954 /* postCellIcon@2x.png in Resources */, 390C208017A921C900D85954 /* hatchery_1@2x.jpg in Resources */, 390C208117A921C900D85954 /* hatchery_2@2x.jpg in Resources */, @@ -2990,6 +3245,7 @@ 39ABDE7516772B7700025349 /* UIImage+Alpha.m in Sources */, 39ABDE7616772B7700025349 /* UIImage+Helper.m in Sources */, 39ABDE7716772B7700025349 /* UIImage+Resize.m in Sources */, + 39BD910C192141C400F9985B /* UIAlertView+Blocks.m in Sources */, 39ABDE7816772B7700025349 /* UIImage+RoundedCorner.m in Sources */, 39ABDE7916772B7700025349 /* UIView+i7Rotate360.m in Sources */, 39ABDEDD16772BA800025349 /* CGICalendar.m in Sources */, @@ -3021,6 +3277,7 @@ 39ABDEF616772BA800025349 /* NSManagedObjectModel+MagicalRecord.m in Sources */, 39ABDEF716772BA800025349 /* NSPersistentStore+MagicalRecord.m in Sources */, 39ABDEF816772BA800025349 /* NSPersistentStoreCoordinator+MagicalRecord.m in Sources */, + 394065631925F98D0056D057 /* ViewQuestionsOrPostsViewController.m in Sources */, 39ABDEF916772BA800025349 /* MagicalRecord+Actions.m in Sources */, 39ABDEFA16772BA800025349 /* MagicalRecord+ErrorHandling.m in Sources */, 39ABDEFB16772BA800025349 /* MagicalRecord+iCloud.m in Sources */, @@ -3028,10 +3285,12 @@ 39331D931914155B00BF550A /* NSTimeZone+ProperAbbreviation.m in Sources */, 39ABDEFD16772BA800025349 /* MagicalRecord+Setup.m in Sources */, 39ABDEFE16772BA800025349 /* MagicalRecord+ShorthandSupport.m in Sources */, + 39D38E3C1923FE9B0071142B /* SendPostOrQuestionViewController.m in Sources */, 39ABDEFF16772BA800025349 /* MagicalRecord.m in Sources */, 39ABDF0016772BA800025349 /* MBProgressHUD.m in Sources */, 39ABDF0116772BA800025349 /* ioapi.c in Sources */, 39ABDF0216772BA800025349 /* mztools.c in Sources */, + 39BD910A192141C400F9985B /* RIButtonItem.m in Sources */, 39ABDF0316772BA800025349 /* unzip.c in Sources */, 39ABDF0416772BA800025349 /* zip.c in Sources */, 39ABDF0516772BA800025349 /* OMPageControl.m in Sources */, @@ -3071,6 +3330,7 @@ 39ABDF9B16772C0D00025349 /* NewsWebViewController.m in Sources */, 39ABDF9C16772C0D00025349 /* OpeningScreenViewController.m in Sources */, 39ABDF9D16772C0D00025349 /* PhotoDetailViewController.m in Sources */, + 39BD910B192141C400F9985B /* UIActionSheet+Blocks.m in Sources */, 39ABDF9F16772C0D00025349 /* Place.m in Sources */, 39ABDFA016772C0D00025349 /* SectionHeaderView.m in Sources */, 39ABDFA116772C0D00025349 /* Service.m in Sources */, @@ -3086,6 +3346,7 @@ 39A94B0D1677BCC3008A9CF6 /* JSONKit.m in Sources */, 39559478167DE0AA00F3737C /* AnimalAddPostView.m in Sources */, 398F3D4B167E3705009FE911 /* AnimalTableViewCell.m in Sources */, + 394065601925F2730056D057 /* AnimalDataNewViewController.m in Sources */, 398F3D51167F7B1E009FE911 /* FunAnimalImageOverlayViewController.m in Sources */, 398F3D691681184F009FE911 /* SignForFriendView.m in Sources */, 39650F6316845DF6008EA096 /* AnimalQuestionsTableView.m in Sources */, @@ -3429,7 +3690,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 5.1; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; ONLY_ACTIVE_ARCH = YES; PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; @@ -3456,7 +3717,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 5.1; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; @@ -3483,7 +3744,7 @@ GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = /usr/include/libxml2; INFOPLIST_FILE = "$(SRCROOT)/JerusalemBiblicalZoo-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 4.3; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; OTHER_LDFLAGS = ( "-all_load", "-ObjC", @@ -3503,7 +3764,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ENABLE_OBJC_ARC = YES; - CODE_SIGN_IDENTITY = "iPhone Distribution: shani hajbi"; + CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: shani hajbi"; COPY_PHASE_STRIP = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -3516,7 +3777,7 @@ GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = /usr/include/libxml2; INFOPLIST_FILE = "$(SRCROOT)/JerusalemBiblicalZoo-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 4.3; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; OTHER_LDFLAGS = ( "-all_load", "-ObjC", diff --git a/Files/JerusalemBiblicalZooAppDelegate.m b/Files/JerusalemBiblicalZooAppDelegate.m index 0549113..48ec6fc 100644 --- a/Files/JerusalemBiblicalZooAppDelegate.m +++ b/Files/JerusalemBiblicalZooAppDelegate.m @@ -37,7 +37,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( UIRemoteNotificationTypeSound]; - [self setUpTabBarControllers]; + // [self setUpTabBarControllers]; BOOL askedUser = [[NSUserDefaults standardUserDefaults] boolForKey:@"answeredBugsense"]; @@ -247,18 +247,23 @@ -(void)locationManager:(CLLocationManager *)manager didChangeAuthorizationStatus -(void)setUIAppearence{ - [[UITabBar appearance] setBackgroundImage:[UIImage imageNamed:@"nav_tile"] ]; - [[UIToolbar appearance] setBackgroundImage:[UIImage imageNamed:@"nav_tile"] forToolbarPosition:UIToolbarPositionAny barMetrics:UIBarMetricsDefault]; - [[UITabBar appearanceWhenContainedIn:[AnimalDataTabBarController class], nil] setBackgroundImage:[UIImage imageNamed:@"nav_pattern_baje"] ]; - [[UITabBar appearanceWhenContainedIn:[AnimalDataTabBarController class], nil] setBackgroundColor:UIColorFromRGB(0xf8eddf)]; - [[UINavigationBar appearance] setBackgroundImage:[UIImage imageNamed:@"nav_tile"] forBarMetrics:UIBarMetricsDefault]; - [[UINavigationBar appearance] setTintColor:UIColorFromRGB(0x8C9544)]; - [[UIToolbar appearance] setTintColor:UIColorFromRGB(0xBDB38C)]; - [[UITabBar appearance] setSelectedImageTintColor:UIColorFromRGB(0xC95000)]; - [[UITabBar appearance] setTintColor:UIColorFromRGB(0x3B2F24)]; - [[UITabBar appearanceWhenContainedIn:[AnimalDataTabBarController class], nil] setSelectedImageTintColor:UIColorFromRGB(0x69742C)]; - [[UITableView appearance] setBackgroundColor:UIColorFromRGB(0xBDB38C)]; + self.window.tintColor = [UIColor colorWithRed:0.925 green:0.282 blue:0.090 alpha:1]; +// [[UITableViewCell appearance] setBackgroundColor:[UIColor colorWithRed:0.933 green:0.949 blue:0.902 alpha:1]]; + + // [[UITabBar appearance] setBackgroundImage:[UIImage imageNamed:@"nav_tile"] ]; + // [[UITabBar appearance] setTintColor:UIColorFromRGB(0xD9593A)]; +// [[UIToolbar appearance] setBackgroundImage:[UIImage imageNamed:@"nav_tile"] forToolbarPosition:UIToolbarPositionAny barMetrics:UIBarMetricsDefault]; +// [[UITabBar appearanceWhenContainedIn:[AnimalDataTabBarController class], nil] setBackgroundImage:[UIImage imageNamed:@"nav_pattern_baje"] ]; +// [[UITabBar appearanceWhenContainedIn:[AnimalDataTabBarController class], nil] setBackgroundColor:UIColorFromRGB(0xf8eddf)]; +// [[UINavigationBar appearance] setBackgroundImage:[UIImage imageNamed:@"nav_tile"] forBarMetrics:UIBarMetricsDefault]; +// +// [[UINavigationBar appearance] setTintColor:UIColorFromRGB(0x8C9544)]; +// [[UIToolbar appearance] setTintColor:UIColorFromRGB(0xBDB38C)]; +// [[UITabBar appearance] setSelectedImageTintColor:UIColorFromRGB(0xEFF1E7)]; +//// [[UITabBar appearance] setTintColor:UIColorFromRGB(0x3B2F24)]; +// [[UITabBar appearanceWhenContainedIn:[AnimalDataTabBarController class], nil] setSelectedImageTintColor:UIColorFromRGB(0x69742C)]; + [[UITableView appearance] setBackgroundColor:[UIColor colorWithRed:0.933 green:0.949 blue:0.902 alpha:1]]; } -(void)setUpMagicalRecord{ // [MagicalRecord setupCoreDataStack]; @@ -281,7 +286,6 @@ -(void)setUpMagicalRecord{ } } } - [MagicalRecord setupCoreDataStackWithAutoMigratingSqliteStoreNamed:@"JerusalemBiblicalZooSeed.sqlite"]; if (firstLunch) { @@ -318,53 +322,27 @@ -(void)setUpParse{ -(void)setUpTabBarControllers{ - // Create a tabbar controller and an array to contain the view controllers - if (!self.tabBarController) { - self.tabBarController = [[UITabBarController alloc] init]; - - } - self.tabBarController.viewControllers = @[]; - NSMutableArray *localViewControllersArray = [NSMutableArray array]; - - ExhibitsViewController *exhibitsViewController = [[ExhibitsViewController alloc] initWithStyle:UITableViewStylePlain]; - exhibitsViewController.tabBarItem = [[UITabBarItem alloc] initWithTitle:[Helper languageSelectedStringForKey:@"Exhibits"] image:[UIImage imageNamed:@"exhibits"] tag:0]; - UINavigationController *nc = [[UINavigationController alloc]initWithRootViewController:exhibitsViewController]; - [localViewControllersArray addObject:nc]; - - + UITabBarController* tabBar = (UITabBarController *)self.window.rootViewController; - EventsTableViewController *eventsTableViewController = [[EventsTableViewController alloc] initWithStyle:UITableViewStylePlain]; - eventsTableViewController.tabBarItem = [[UITabBarItem alloc] initWithTitle:[Helper languageSelectedStringForKey:@"Events"] image:[UIImage imageNamed:@"events"] tag:1]; - nc = [[UINavigationController alloc]initWithRootViewController:eventsTableViewController]; - [localViewControllersArray addObject:nc]; + // reload the storyboard in the selected language + NSString *bundlePath = [[NSBundle mainBundle] pathForResource:[Helper currentLang] ofType:@"lproj"]; + NSBundle *bundle = [NSBundle bundleWithPath:bundlePath]; + UIStoryboard *storyBoard = [UIStoryboard storyboardWithName:@"MainStoryboard" bundle:nil]; - self.mapController = [[TileMapViewController alloc] init]; - self.mapController.tabBarItem = [[UITabBarItem alloc] initWithTitle:[Helper languageSelectedStringForKey:@"Map"] image:[UIImage imageNamed:@"088-Map"] tag:2]; - nc = [[UINavigationController alloc]initWithRootViewController:self.mapController]; - [localViewControllersArray addObject:nc]; - NewsListViewController *news = [[NewsListViewController alloc] init]; - news.tabBarItem = [[UITabBarItem alloc] initWithTitle:[Helper languageSelectedStringForKey:@"News"] image:[UIImage imageNamed:@"121-Mic"] tag:3]; - nc = [[UINavigationController alloc]initWithRootViewController:news]; - [localViewControllersArray addObject:nc]; + // reload the view controllers + UINavigationController *exhibitsController = (UINavigationController *)[storyBoard instantiateViewControllerWithIdentifier:@"ExhibitsNavController"]; + UINavigationController *eventsNavController = (UINavigationController *)[storyBoard instantiateViewControllerWithIdentifier:@"EventsNavController"]; + UINavigationController *mapNavController = (UINavigationController *)[storyBoard instantiateViewControllerWithIdentifier:@"MapNavController"]; + UINavigationController *newsNavController = (UINavigationController *)[storyBoard instantiateViewControllerWithIdentifier:@"NewsNavController"]; + UINavigationController *funNavController = (UINavigationController *)[storyBoard instantiateViewControllerWithIdentifier:@"FunNavController"]; - FunViewController * funViewController = [[FunViewController alloc] initWithNibName:@"FunViewController" bundle:[Helper localizationBundle]]; - funViewController.tabBarItem = [[UITabBarItem alloc] initWithTitle:[Helper languageSelectedStringForKey:@"More"] image:[UIImage imageNamed:@"056-PlusCircle"] tag:4]; - nc = [[UINavigationController alloc]initWithRootViewController:funViewController]; - [localViewControllersArray addObject:nc]; - - // set the tab bar controller view controller array to the localViewControllersArray - self.tabBarController.viewControllers = localViewControllersArray; - - - // set the window subview as the tab bar controller - [self.window setRootViewController:self.tabBarController]; - - // make the window visible - [self.window makeKeyAndVisible]; - - // [eventsTableViewController updateCalendar]; + // set them + NSArray *newViewControllers = @[exhibitsController, eventsNavController, mapNavController, newsNavController, funNavController]; + tabBar.viewControllers = newViewControllers; + + [eventsNavController.viewControllers[0] updateCalendar]; } -(void)refreshViewControllersAfterLangChange{ diff --git a/Files/MainStoryboard.storyboard b/Files/MainStoryboard.storyboard new file mode 100644 index 0000000..a862f8e --- /dev/null +++ b/Files/MainStoryboard.storyboard @@ -0,0 +1,846 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Files/NewsCell.m b/Files/NewsCell.m index ed35853..57b35fb 100644 --- a/Files/NewsCell.m +++ b/Files/NewsCell.m @@ -74,20 +74,20 @@ - (void)layoutSubviews { CGRect rect = CGRectMake(self.bounds.size.width-96,(self.bounds.size.height-86)/2, 86, 86); self.imageView.frame = rect; - rect = CGRectMake(5, 10, 210, 20); + rect = CGRectMake(5, 25, 210, 20); UIFont *font = [UIFont fontWithName:@"ArialHebrew-Bold" size:16]; labelView.font = font; labelView.frame = rect; labelView.textAlignment = UITextAlignmentRight; - rect.origin.y = rect.origin.y+ 20; + rect.origin.y = rect.origin.y; rect.size.height = CGRectGetHeight(self.bounds)*0.7; detailLableView.frame = rect; detailLableView.textAlignment= NSTextAlignmentRight; } - self.imageView.layer.borderWidth = 4.0; - self.imageView.layer.borderColor = UIColorFromRGB(0x3A2E23).CGColor; + self.imageView.layer.borderWidth = 3.0; + self.imageView.layer.borderColor = [UIColor colorWithRed:0.463 green:0.365 blue:0.322 alpha:1].CGColor; self.imageView.layer.cornerRadius =43; self.imageView.clipsToBounds=YES; self.imageView.layer.shouldRasterize=YES; diff --git a/Files/NewsListViewController.m b/Files/NewsListViewController.m index a4a1b59..290b8fc 100644 --- a/Files/NewsListViewController.m +++ b/Files/NewsListViewController.m @@ -15,10 +15,8 @@ @implementation NewsListViewController -- (id)initWithStyle:(UITableViewStyle)style +- (void)awakeFromNib { - self = [super initWithStyle:style]; - if (self) { // Custom the table self.title = [Helper languageSelectedStringForKey:@"News"]; UIBarButtonItem *barItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemRefresh target:self action:@selector(refreshObjects)]; @@ -27,7 +25,6 @@ - (id)initWithStyle:(UITableViewStyle)style // The className to query on self.className = @"News"; - self.tableView.backgroundColor = UIColorFromRGB(0x8C817B); // Whether the built-in pull-to-refresh is enabled self.pullToRefreshEnabled = NO; @@ -37,10 +34,7 @@ - (id)initWithStyle:(UITableViewStyle)style // The number of objects to show per page self.objectsPerPage = 6; - - - } - return self; + } -(void)refreshObjects{ diff --git a/Files/SectionHeaderView.m b/Files/SectionHeaderView.m index 4e43448..40c191d 100644 --- a/Files/SectionHeaderView.m +++ b/Files/SectionHeaderView.m @@ -76,7 +76,7 @@ -(id)initWithFrame:(CGRect)frame{ if (self != nil) { self.userInteractionEnabled = NO; - self.backgroundColor = UIColorFromRGB(0x3A2E23); + self.backgroundColor = [UIColor colorWithRed:0.925 green:0.282 blue:0.090 alpha:1]; self.dateLabelView = nil; diff --git a/Files/SendPostOrQuestionViewController.h b/Files/SendPostOrQuestionViewController.h new file mode 100644 index 0000000..d5a660c --- /dev/null +++ b/Files/SendPostOrQuestionViewController.h @@ -0,0 +1,24 @@ +// +// sendPostOrQuestionViewController.h +// JerusalemBiblicalZoo +// +// Created by shani hajbi on 5/14/14. +// +// + +typedef NS_ENUM(NSUInteger, PostType) +{ + PostTypePost, + PostTypeQuestion +}; + +#import + +@interface SendPostOrQuestionViewController : UITableViewController +@property (nonatomic, strong) Animal *animal; +@property (nonatomic, weak) IBOutlet UITextView *contentTextView; +@property (nonatomic, weak) IBOutlet UITextField *nameTextField; +@property (nonatomic, weak) IBOutlet UITextField *cityTextField; +@property (nonatomic) PostType postType; + +@end diff --git a/Files/SendPostOrQuestionViewController.m b/Files/SendPostOrQuestionViewController.m new file mode 100644 index 0000000..f98593b --- /dev/null +++ b/Files/SendPostOrQuestionViewController.m @@ -0,0 +1,102 @@ +// +// sendPostOrQuestionViewController.m +// JerusalemBiblicalZoo +// +// Created by shani hajbi on 5/14/14. +// +// + +#import "SendPostOrQuestionViewController.h" + +@implementation SendPostOrQuestionViewController + +- (void)viewDidLoad +{ + [super viewDidLoad]; + [self.contentTextView becomeFirstResponder]; +} + + +- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath +{ + if (indexPath.row == 3) { + if (self.postType == PostTypePost) + { + [self sendPost]; + } + else + { + [self sendQuestion]; + } + + } +} + +-(BOOL)verifyPost{ + if (self.contentTextView.text.length > 0 && self.nameTextField.text.length > 0 && self.cityTextField.text.length > 0) { + return YES; + } + [self showVeiricationAlert]; + return NO; +} + +- (void)showVeiricationAlert +{ + UIAlertView *alert = [[UIAlertView alloc] initWithTitle:[Helper languageSelectedStringForKey:@"Post Attantion"] + message:[Helper languageSelectedStringForKey:@"Post Missing Data Massege"] delegate:self cancelButtonTitle:[Helper languageSelectedStringForKey:@"Dismiss"] otherButtonTitles:nil]; + [alert show]; +} + +-(void)sendPost +{ + if (![self verifyPost]) return; + // Create the object. + PFObject *userPost = [PFObject objectWithClassName:@"AnimalPost"]; + userPost[@"text"] = self.contentTextView.text; + if(self.animal.nameEn!=nil){ + userPost[@"animalNameEn"] = self.animal.nameEn; + } + NSString * userNameAndCity = [NSString stringWithFormat:@"%@, %@",self.nameTextField.text,self.cityTextField.text]; + userPost[@"user"] = userNameAndCity; + userPost[@"animal_id"] = self.animal.objectId; + userPost[@"visible"] = @NO; + + [userPost saveEventually]; + + [self.contentTextView resignFirstResponder]; + [self.cityTextField resignFirstResponder]; + [self.nameTextField resignFirstResponder]; + + UIAlertView *alert = [[UIAlertView alloc] initWithTitle:[Helper languageSelectedStringForKey:@"Post Tanks"] + message:[Helper languageSelectedStringForKey:@"Post Suscess Massege"] delegate:nil cancelButtonTitle:[Helper languageSelectedStringForKey:@"Dismiss"] otherButtonTitles:nil]; + [alert show]; + +} + +-(void)sendQuestion{ + if (![self verifyPost]) return; + + PFObject *userQuestion = [PFObject objectWithClassName:@"AnimalQuestions"]; + NSString *key = [Helper appLang]==kHebrew?@"question":@"question_en"; + userQuestion[key] = self.contentTextView.text; + + NSString * userNameAndCity = [NSString stringWithFormat:@"%@, %@",self.nameTextField.text,self.cityTextField.text]; + userQuestion[@"user_name"] = userNameAndCity; + userQuestion[@"visible"] = @NO; + + [userQuestion saveEventually]; + + + [self.contentTextView setText:@""]; + [self.nameTextField setText:@""]; + [self.cityTextField setText:@""]; + + + UIAlertView *alert = [[UIAlertView alloc] initWithTitle:[Helper languageSelectedStringForKey:@"Question Tanks"] + message:[Helper languageSelectedStringForKey:@"Question Suscess Massege"] delegate:self cancelButtonTitle:[Helper languageSelectedStringForKey:@"Dismiss"] otherButtonTitles:nil]; + [alert show]; +} + + + +@end diff --git a/Files/TileMapViewController.m b/Files/TileMapViewController.m index 2f20e06..cb445d2 100644 --- a/Files/TileMapViewController.m +++ b/Files/TileMapViewController.m @@ -74,16 +74,11 @@ + (CGFloat)calloutHeight; return 30.0f; } -- (id)init +- (void)awakeFromNib { - self = [super init]; - if (self) { // Custom initialization self.title = [Helper languageSelectedStringForKey:@"Map"]; - - - } - return self; + self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"789-map-location"] style:UIBarButtonItemStylePlain target:self action:@selector(showUserLocation)]; } @@ -156,6 +151,7 @@ -(void)appWillResignActiveNotif:(NSNotification*)notif } + #pragma mark - #pragma mark UIPinchGestureRecognizer @@ -212,9 +208,9 @@ - (void) viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; - + if (!IS_IPHONE_5) { [self.navigationController setNavigationBarHidden:YES animated:animated]; - + } [self.map setShowsUserLocation:YES]; @@ -231,8 +227,9 @@ - (void) viewWillAppear:(BOOL)animated - (void) viewWillDisappear:(BOOL)animated { [super viewWillDisappear:animated]; - - [self.navigationController setNavigationBarHidden:NO animated:animated]; + if (!IS_IPHONE_5) { + [self.navigationController setNavigationBarHidden:NO animated:animated]; + } } @@ -244,7 +241,7 @@ - (MKOverlayView *)mapView:(MKMapView *)mapView viewForOverlay:(id )o view.tileAlpha = 1; return view; }else if([overlay isKindOfClass:[MKPolygon class]]){ - UIColor *fillColor = UIColorFromRGBA(0x8C9544, 1); + UIColor *fillColor = [UIColor colorWithRed:0.749 green:0.737 blue:0.631 alpha:1]; MKPolygonView *polyLineView = [[MKPolygonView alloc] initWithOverlay: overlay]; polyLineView.fillColor = fillColor; return polyLineView; @@ -304,37 +301,6 @@ - (void)mapView:(MKMapView *)mapView annotationView:(MKAnnotationView *)view cal } } -- (void)showDetails:(id)sender -{ -// -// MKAnnotationView *annotationView = (MKAnnotationView*) [[sender superview]superview]; -// ExhibitAnnotation *anootation = (ExhibitAnnotation*)annotationView.annotation; -// -// Exhibit *exhibit = anootation.exhibit; -// -// -// NSArray *animals = [exhibit localAnimals]; -// [self.navigationController setToolbarHidden:YES animated:NO]; -// if ([animals count]==1) { -// AnimalDataTabBarController *anialViewController = [[AnimalDataTabBarController alloc] initWithAnimal:[animals lastObject]]; -// if(!IS_IPHONE_5){ -// self.navigationController.navigationBar.tintColor = nil; -// self.navigationController.navigationBar.barStyle = UIBarStyleBlackTranslucent; -// } -// [anialViewController setHidesBottomBarWhenPushed:YES]; -// [self.navigationController pushViewController:anialViewController animated:YES]; -// -// } else if([animals count]>1){ -// ExhibitAnimalsViewController * exhibitAnimalsViewController = [[ExhibitAnimalsViewController alloc] init]; -// exhibitAnimalsViewController.exhibit = exhibit; -// [self.navigationController pushViewController:exhibitAnimalsViewController animated:YES]; -// -// }else{ -// NSLog(@"no animals in the exhibit"); -// } -// -// -} @@ -414,9 +380,9 @@ - (void)openAnnotation:(id)annotation; - (void)mapView:(MKMapView *)mapView didUpdateUserLocation: (MKUserLocation *)userLocation { static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - // mapView.centerCoordinate = userLocation.location.coordinate; - }); + // dispatch_once(&onceToken, ^{ + mapView.centerCoordinate = userLocation.location.coordinate; + // }); } - (void)mapView:(MKMapView *)mapView regionWillChangeAnimated:(BOOL)animated @@ -426,9 +392,6 @@ - (void)mapView:(MKMapView *)mapView regionWillChangeAnimated:(BOOL)animated } - (void)mapView:(MKMapView *)mapView regionDidChangeAnimated:(BOOL)animated { - - - for (ExhibitAnnotation *annotation in mapView.annotations) { // @@ -476,6 +439,7 @@ - (void)locationManager:(CLLocationManager *)manager didUpdateToLocation:(CLLoca if( [newLocation distanceFromLocation:mapCenterLocation]<1000){ NSLog(@"user is in zoo"); + }else{ static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ @@ -518,6 +482,7 @@ -(void)setCenterLocationAndShowMapForExhibit:(Exhibit *)exhibit{ } + -(void)showAnnotationForExhibit:(Exhibit*)exhibit{ for (ExhibitAnnotation *annotation in self.map.annotations) { @@ -528,10 +493,11 @@ -(void)showAnnotationForExhibit:(Exhibit*)exhibit{ } } } - - +} - +- (void)showUserLocation +{ + [locationManager startUpdatingLocation]; } @end diff --git a/Files/UI images/704-compose-selected.png b/Files/UI images/704-compose-selected.png new file mode 100644 index 0000000..52767cd Binary files /dev/null and b/Files/UI images/704-compose-selected.png differ diff --git a/Files/UI images/704-compose-selected@2x.png b/Files/UI images/704-compose-selected@2x.png new file mode 100644 index 0000000..f398bea Binary files /dev/null and b/Files/UI images/704-compose-selected@2x.png differ diff --git a/Files/UI images/704-compose.png b/Files/UI images/704-compose.png new file mode 100644 index 0000000..7493ed6 Binary files /dev/null and b/Files/UI images/704-compose.png differ diff --git a/Files/UI images/704-compose@2x.png b/Files/UI images/704-compose@2x.png new file mode 100644 index 0000000..d77e1fa Binary files /dev/null and b/Files/UI images/704-compose@2x.png differ diff --git a/Files/UI images/714-camera-selected.png b/Files/UI images/714-camera-selected.png new file mode 100644 index 0000000..d61f2ce Binary files /dev/null and b/Files/UI images/714-camera-selected.png differ diff --git a/Files/UI images/714-camera-selected@2x.png b/Files/UI images/714-camera-selected@2x.png new file mode 100644 index 0000000..6152019 Binary files /dev/null and b/Files/UI images/714-camera-selected@2x.png differ diff --git a/Files/UI images/714-camera.png b/Files/UI images/714-camera.png new file mode 100644 index 0000000..5cd3c99 Binary files /dev/null and b/Files/UI images/714-camera.png differ diff --git a/Files/UI images/714-camera@2x.png b/Files/UI images/714-camera@2x.png new file mode 100644 index 0000000..5f1fb76 Binary files /dev/null and b/Files/UI images/714-camera@2x.png differ diff --git a/Files/UI images/721-bookmarks.png b/Files/UI images/721-bookmarks.png new file mode 100644 index 0000000..0ecb8da Binary files /dev/null and b/Files/UI images/721-bookmarks.png differ diff --git a/Files/UI images/721-bookmarks@2x.png b/Files/UI images/721-bookmarks@2x.png new file mode 100644 index 0000000..c7784c5 Binary files /dev/null and b/Files/UI images/721-bookmarks@2x.png differ diff --git a/Files/UI images/724-info.png b/Files/UI images/724-info.png new file mode 100644 index 0000000..68374e4 Binary files /dev/null and b/Files/UI images/724-info.png differ diff --git a/Files/UI images/724-info@2x.png b/Files/UI images/724-info@2x.png new file mode 100644 index 0000000..c11d925 Binary files /dev/null and b/Files/UI images/724-info@2x.png differ diff --git a/Files/UI images/726-star-selected.png b/Files/UI images/726-star-selected.png new file mode 100644 index 0000000..6788704 Binary files /dev/null and b/Files/UI images/726-star-selected.png differ diff --git a/Files/UI images/726-star-selected@2x.png b/Files/UI images/726-star-selected@2x.png new file mode 100644 index 0000000..3669edc Binary files /dev/null and b/Files/UI images/726-star-selected@2x.png differ diff --git a/Files/UI images/726-star.png b/Files/UI images/726-star.png new file mode 100644 index 0000000..84ebf86 Binary files /dev/null and b/Files/UI images/726-star.png differ diff --git a/Files/UI images/726-star@2x.png b/Files/UI images/726-star@2x.png new file mode 100644 index 0000000..c35c511 Binary files /dev/null and b/Files/UI images/726-star@2x.png differ diff --git a/Files/UI images/740-gear.png b/Files/UI images/740-gear.png new file mode 100644 index 0000000..95fb01f Binary files /dev/null and b/Files/UI images/740-gear.png differ diff --git a/Files/UI images/740-gear@2x.png b/Files/UI images/740-gear@2x.png new file mode 100644 index 0000000..bd8315e Binary files /dev/null and b/Files/UI images/740-gear@2x.png differ diff --git a/Files/UI images/747-tag.png b/Files/UI images/747-tag.png new file mode 100644 index 0000000..7c3670d Binary files /dev/null and b/Files/UI images/747-tag.png differ diff --git a/Files/UI images/747-tag@2x.png b/Files/UI images/747-tag@2x.png new file mode 100644 index 0000000..311bff9 Binary files /dev/null and b/Files/UI images/747-tag@2x.png differ diff --git a/Files/UI images/789-map-location.png b/Files/UI images/789-map-location.png new file mode 100644 index 0000000..59178f9 Binary files /dev/null and b/Files/UI images/789-map-location.png differ diff --git a/Files/UI images/789-map-location@2x.png b/Files/UI images/789-map-location@2x.png new file mode 100644 index 0000000..fb8371b Binary files /dev/null and b/Files/UI images/789-map-location@2x.png differ diff --git a/Files/UI images/815-car-selected.png b/Files/UI images/815-car-selected.png new file mode 100644 index 0000000..c085f1b Binary files /dev/null and b/Files/UI images/815-car-selected.png differ diff --git a/Files/UI images/815-car-selected@2x.png b/Files/UI images/815-car-selected@2x.png new file mode 100644 index 0000000..8fa70da Binary files /dev/null and b/Files/UI images/815-car-selected@2x.png differ diff --git a/Files/UI images/815-car.png b/Files/UI images/815-car.png new file mode 100644 index 0000000..a32bb31 Binary files /dev/null and b/Files/UI images/815-car.png differ diff --git a/Files/UI images/815-car@2x.png b/Files/UI images/815-car@2x.png new file mode 100644 index 0000000..7272961 Binary files /dev/null and b/Files/UI images/815-car@2x.png differ diff --git a/Files/UI images/851-calendar-selected.png b/Files/UI images/851-calendar-selected.png new file mode 100644 index 0000000..5a3e0b8 Binary files /dev/null and b/Files/UI images/851-calendar-selected.png differ diff --git a/Files/UI images/851-calendar-selected@2x.png b/Files/UI images/851-calendar-selected@2x.png new file mode 100644 index 0000000..64c5b19 Binary files /dev/null and b/Files/UI images/851-calendar-selected@2x.png differ diff --git a/Files/UI images/851-calendar.png b/Files/UI images/851-calendar.png new file mode 100644 index 0000000..f4c337b Binary files /dev/null and b/Files/UI images/851-calendar.png differ diff --git a/Files/UI images/851-calendar@2x.png b/Files/UI images/851-calendar@2x.png new file mode 100644 index 0000000..8f86c58 Binary files /dev/null and b/Files/UI images/851-calendar@2x.png differ diff --git a/Files/UI images/852-map-selected.png b/Files/UI images/852-map-selected.png new file mode 100644 index 0000000..c7277e4 Binary files /dev/null and b/Files/UI images/852-map-selected.png differ diff --git a/Files/UI images/852-map-selected@2x.png b/Files/UI images/852-map-selected@2x.png new file mode 100644 index 0000000..0392026 Binary files /dev/null and b/Files/UI images/852-map-selected@2x.png differ diff --git a/Files/UI images/852-map.png b/Files/UI images/852-map.png new file mode 100644 index 0000000..4eadfd8 Binary files /dev/null and b/Files/UI images/852-map.png differ diff --git a/Files/UI images/852-map@2x.png b/Files/UI images/852-map@2x.png new file mode 100644 index 0000000..ab0049b Binary files /dev/null and b/Files/UI images/852-map@2x.png differ diff --git a/Files/UI images/873-magic-wand-selected.png b/Files/UI images/873-magic-wand-selected.png new file mode 100644 index 0000000..5b3f79f Binary files /dev/null and b/Files/UI images/873-magic-wand-selected.png differ diff --git a/Files/UI images/873-magic-wand-selected@2x.png b/Files/UI images/873-magic-wand-selected@2x.png new file mode 100644 index 0000000..97575b1 Binary files /dev/null and b/Files/UI images/873-magic-wand-selected@2x.png differ diff --git a/Files/UI images/873-magic-wand.png b/Files/UI images/873-magic-wand.png new file mode 100644 index 0000000..5b3f79f Binary files /dev/null and b/Files/UI images/873-magic-wand.png differ diff --git a/Files/UI images/873-magic-wand@2x.png b/Files/UI images/873-magic-wand@2x.png new file mode 100644 index 0000000..97575b1 Binary files /dev/null and b/Files/UI images/873-magic-wand@2x.png differ diff --git a/Files/UI images/874-newspaper-selected.png b/Files/UI images/874-newspaper-selected.png new file mode 100644 index 0000000..306f894 Binary files /dev/null and b/Files/UI images/874-newspaper-selected.png differ diff --git a/Files/UI images/874-newspaper-selected@2x.png b/Files/UI images/874-newspaper-selected@2x.png new file mode 100644 index 0000000..065e9d3 Binary files /dev/null and b/Files/UI images/874-newspaper-selected@2x.png differ diff --git a/Files/UI images/874-newspaper.png b/Files/UI images/874-newspaper.png new file mode 100644 index 0000000..c178524 Binary files /dev/null and b/Files/UI images/874-newspaper.png differ diff --git a/Files/UI images/874-newspaper@2x.png b/Files/UI images/874-newspaper@2x.png new file mode 100644 index 0000000..72ad35d Binary files /dev/null and b/Files/UI images/874-newspaper@2x.png differ diff --git a/Files/UI images/946-microphone-selected.png b/Files/UI images/946-microphone-selected.png new file mode 100644 index 0000000..9e0e247 Binary files /dev/null and b/Files/UI images/946-microphone-selected.png differ diff --git a/Files/UI images/946-microphone-selected@2x.png b/Files/UI images/946-microphone-selected@2x.png new file mode 100644 index 0000000..0e64afc Binary files /dev/null and b/Files/UI images/946-microphone-selected@2x.png differ diff --git a/Files/UI images/946-microphone.png b/Files/UI images/946-microphone.png new file mode 100644 index 0000000..95afc3c Binary files /dev/null and b/Files/UI images/946-microphone.png differ diff --git a/Files/UI images/946-microphone@2x.png b/Files/UI images/946-microphone@2x.png new file mode 100644 index 0000000..bef132d Binary files /dev/null and b/Files/UI images/946-microphone@2x.png differ diff --git a/Files/UI images/event_feeding_new.png b/Files/UI images/event_feeding_new.png new file mode 100644 index 0000000..9060367 Binary files /dev/null and b/Files/UI images/event_feeding_new.png differ diff --git a/Files/UI images/event_feeding_new@2x.png b/Files/UI images/event_feeding_new@2x.png new file mode 100644 index 0000000..cf2ce61 Binary files /dev/null and b/Files/UI images/event_feeding_new@2x.png differ diff --git a/Files/UI images/event_talk_new.png b/Files/UI images/event_talk_new.png new file mode 100644 index 0000000..ad55073 Binary files /dev/null and b/Files/UI images/event_talk_new.png differ diff --git a/Files/UI images/event_talk_new@2x.png b/Files/UI images/event_talk_new@2x.png new file mode 100644 index 0000000..ac2b0f0 Binary files /dev/null and b/Files/UI images/event_talk_new@2x.png differ diff --git a/Files/UI images/iOS7_images/704-compose-selected.png b/Files/UI images/iOS7_images/704-compose-selected.png new file mode 100644 index 0000000..52767cd Binary files /dev/null and b/Files/UI images/iOS7_images/704-compose-selected.png differ diff --git a/Files/UI images/iOS7_images/704-compose-selected@2x.png b/Files/UI images/iOS7_images/704-compose-selected@2x.png new file mode 100644 index 0000000..f398bea Binary files /dev/null and b/Files/UI images/iOS7_images/704-compose-selected@2x.png differ diff --git a/Files/UI images/iOS7_images/704-compose.png b/Files/UI images/iOS7_images/704-compose.png new file mode 100644 index 0000000..7493ed6 Binary files /dev/null and b/Files/UI images/iOS7_images/704-compose.png differ diff --git a/Files/UI images/iOS7_images/704-compose@2x.png b/Files/UI images/iOS7_images/704-compose@2x.png new file mode 100644 index 0000000..d77e1fa Binary files /dev/null and b/Files/UI images/iOS7_images/704-compose@2x.png differ diff --git a/Files/UI images/iOS7_images/714-camera-selected.png b/Files/UI images/iOS7_images/714-camera-selected.png new file mode 100644 index 0000000..d61f2ce Binary files /dev/null and b/Files/UI images/iOS7_images/714-camera-selected.png differ diff --git a/Files/UI images/iOS7_images/714-camera-selected@2x.png b/Files/UI images/iOS7_images/714-camera-selected@2x.png new file mode 100644 index 0000000..6152019 Binary files /dev/null and b/Files/UI images/iOS7_images/714-camera-selected@2x.png differ diff --git a/Files/UI images/iOS7_images/714-camera.png b/Files/UI images/iOS7_images/714-camera.png new file mode 100644 index 0000000..5cd3c99 Binary files /dev/null and b/Files/UI images/iOS7_images/714-camera.png differ diff --git a/Files/UI images/iOS7_images/714-camera@2x.png b/Files/UI images/iOS7_images/714-camera@2x.png new file mode 100644 index 0000000..5f1fb76 Binary files /dev/null and b/Files/UI images/iOS7_images/714-camera@2x.png differ diff --git a/Files/UI images/iOS7_images/815-car-selected.png b/Files/UI images/iOS7_images/815-car-selected.png new file mode 100644 index 0000000..c085f1b Binary files /dev/null and b/Files/UI images/iOS7_images/815-car-selected.png differ diff --git a/Files/UI images/iOS7_images/815-car-selected@2x.png b/Files/UI images/iOS7_images/815-car-selected@2x.png new file mode 100644 index 0000000..8fa70da Binary files /dev/null and b/Files/UI images/iOS7_images/815-car-selected@2x.png differ diff --git a/Files/UI images/iOS7_images/815-car.png b/Files/UI images/iOS7_images/815-car.png new file mode 100644 index 0000000..a32bb31 Binary files /dev/null and b/Files/UI images/iOS7_images/815-car.png differ diff --git a/Files/UI images/iOS7_images/815-car@2x.png b/Files/UI images/iOS7_images/815-car@2x.png new file mode 100644 index 0000000..7272961 Binary files /dev/null and b/Files/UI images/iOS7_images/815-car@2x.png differ diff --git a/Files/UI images/iOS7_images/851-calendar-selected.png b/Files/UI images/iOS7_images/851-calendar-selected.png new file mode 100644 index 0000000..5a3e0b8 Binary files /dev/null and b/Files/UI images/iOS7_images/851-calendar-selected.png differ diff --git a/Files/UI images/iOS7_images/851-calendar-selected@2x.png b/Files/UI images/iOS7_images/851-calendar-selected@2x.png new file mode 100644 index 0000000..64c5b19 Binary files /dev/null and b/Files/UI images/iOS7_images/851-calendar-selected@2x.png differ diff --git a/Files/UI images/iOS7_images/851-calendar.png b/Files/UI images/iOS7_images/851-calendar.png new file mode 100644 index 0000000..f4c337b Binary files /dev/null and b/Files/UI images/iOS7_images/851-calendar.png differ diff --git a/Files/UI images/iOS7_images/851-calendar@2x.png b/Files/UI images/iOS7_images/851-calendar@2x.png new file mode 100644 index 0000000..8f86c58 Binary files /dev/null and b/Files/UI images/iOS7_images/851-calendar@2x.png differ diff --git a/Files/UI images/iOS7_images/852-map-selected.png b/Files/UI images/iOS7_images/852-map-selected.png new file mode 100644 index 0000000..c7277e4 Binary files /dev/null and b/Files/UI images/iOS7_images/852-map-selected.png differ diff --git a/Files/UI images/iOS7_images/852-map-selected@2x.png b/Files/UI images/iOS7_images/852-map-selected@2x.png new file mode 100644 index 0000000..0392026 Binary files /dev/null and b/Files/UI images/iOS7_images/852-map-selected@2x.png differ diff --git a/Files/UI images/iOS7_images/852-map.png b/Files/UI images/iOS7_images/852-map.png new file mode 100644 index 0000000..4eadfd8 Binary files /dev/null and b/Files/UI images/iOS7_images/852-map.png differ diff --git a/Files/UI images/iOS7_images/852-map@2x.png b/Files/UI images/iOS7_images/852-map@2x.png new file mode 100644 index 0000000..ab0049b Binary files /dev/null and b/Files/UI images/iOS7_images/852-map@2x.png differ diff --git a/Files/UI images/iOS7_images/873-magic-wand-selected.png b/Files/UI images/iOS7_images/873-magic-wand-selected.png new file mode 100644 index 0000000..5b3f79f Binary files /dev/null and b/Files/UI images/iOS7_images/873-magic-wand-selected.png differ diff --git a/Files/UI images/iOS7_images/873-magic-wand-selected@2x.png b/Files/UI images/iOS7_images/873-magic-wand-selected@2x.png new file mode 100644 index 0000000..97575b1 Binary files /dev/null and b/Files/UI images/iOS7_images/873-magic-wand-selected@2x.png differ diff --git a/Files/UI images/iOS7_images/873-magic-wand.png b/Files/UI images/iOS7_images/873-magic-wand.png new file mode 100644 index 0000000..5b3f79f Binary files /dev/null and b/Files/UI images/iOS7_images/873-magic-wand.png differ diff --git a/Files/UI images/iOS7_images/873-magic-wand@2x.png b/Files/UI images/iOS7_images/873-magic-wand@2x.png new file mode 100644 index 0000000..97575b1 Binary files /dev/null and b/Files/UI images/iOS7_images/873-magic-wand@2x.png differ diff --git a/Files/UI images/iOS7_images/874-newspaper-selected.png b/Files/UI images/iOS7_images/874-newspaper-selected.png new file mode 100644 index 0000000..306f894 Binary files /dev/null and b/Files/UI images/iOS7_images/874-newspaper-selected.png differ diff --git a/Files/UI images/iOS7_images/874-newspaper-selected@2x.png b/Files/UI images/iOS7_images/874-newspaper-selected@2x.png new file mode 100644 index 0000000..065e9d3 Binary files /dev/null and b/Files/UI images/iOS7_images/874-newspaper-selected@2x.png differ diff --git a/Files/UI images/iOS7_images/874-newspaper.png b/Files/UI images/iOS7_images/874-newspaper.png new file mode 100644 index 0000000..c178524 Binary files /dev/null and b/Files/UI images/iOS7_images/874-newspaper.png differ diff --git a/Files/UI images/iOS7_images/874-newspaper@2x.png b/Files/UI images/iOS7_images/874-newspaper@2x.png new file mode 100644 index 0000000..72ad35d Binary files /dev/null and b/Files/UI images/iOS7_images/874-newspaper@2x.png differ diff --git a/Files/UI images/iOS7_images/946-microphone-selected.png b/Files/UI images/iOS7_images/946-microphone-selected.png new file mode 100644 index 0000000..9e0e247 Binary files /dev/null and b/Files/UI images/iOS7_images/946-microphone-selected.png differ diff --git a/Files/UI images/iOS7_images/946-microphone-selected@2x.png b/Files/UI images/iOS7_images/946-microphone-selected@2x.png new file mode 100644 index 0000000..0e64afc Binary files /dev/null and b/Files/UI images/iOS7_images/946-microphone-selected@2x.png differ diff --git a/Files/UI images/iOS7_images/946-microphone.png b/Files/UI images/iOS7_images/946-microphone.png new file mode 100644 index 0000000..95afc3c Binary files /dev/null and b/Files/UI images/iOS7_images/946-microphone.png differ diff --git a/Files/UI images/iOS7_images/946-microphone@2x.png b/Files/UI images/iOS7_images/946-microphone@2x.png new file mode 100644 index 0000000..bef132d Binary files /dev/null and b/Files/UI images/iOS7_images/946-microphone@2x.png differ diff --git a/Files/ViewQuestionsOrPostsViewController.h b/Files/ViewQuestionsOrPostsViewController.h new file mode 100644 index 0000000..a97a6ec --- /dev/null +++ b/Files/ViewQuestionsOrPostsViewController.h @@ -0,0 +1,19 @@ +// +// ViewQuestionsOrPostsViewController.h +// JerusalemBiblicalZoo +// +// Created by shani hajbi on 5/16/14. +// +// + +#import +typedef NS_ENUM(NSUInteger, ViewerPostType) +{ + ViewerPostTypePost, + ViewerPostTypeQuestion +}; + +@interface ViewQuestionsOrPostsViewController : PFQueryTableViewController +@property (nonatomic, strong) Animal *animal; +@property (nonatomic) ViewerPostType postType; +@end diff --git a/Files/ViewQuestionsOrPostsViewController.m b/Files/ViewQuestionsOrPostsViewController.m new file mode 100644 index 0000000..d261650 --- /dev/null +++ b/Files/ViewQuestionsOrPostsViewController.m @@ -0,0 +1,124 @@ +// +// ViewQuestionsOrPostsViewController.m +// JerusalemBiblicalZoo +// +// Created by shani hajbi on 5/16/14. +// +// + +#import "ViewQuestionsOrPostsViewController.h" +#import "AnimalQuestionsCell.h" + +#define FONT_SIZE 17.0f +#define CELL_MIN_HEIGHT 40.0f +#define CELL_CONTENT_WIDTH 280.0f +#define CELL_CONTENT_MARGIN 20.0f + +@interface ViewQuestionsOrPostsViewController () +@property (nonatomic, strong) MBProgressHUD *refreshHUD; +@end + +@implementation ViewQuestionsOrPostsViewController + +- (void)awakeFromNib +{ + [super awakeFromNib]; + +} + + +- (void)viewDidLoad +{ + [super viewDidLoad]; + +} + + +- (void)objectsDidLoad:(NSError *)error { + [super objectsDidLoad:error]; + [self.refreshHUD hide:YES]; +// [self toggleExplinationView]; +} + +- (void)objectsWillLoad { + [super objectsWillLoad]; + self.refreshHUD = [[MBProgressHUD alloc] initWithView:self.view]; + [self.view addSubview:self.refreshHUD]; + self.refreshHUD.labelText = [Helper languageSelectedStringForKey:@"Loading"]; + [self.refreshHUD show:YES]; +} + +- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath +{ + if(indexPath.row==[self.objects count])return 0; + PFObject *object = [self.objects objectAtIndex:[indexPath row]]; + NSString *key = [Helper appLang]==kHebrew?@"question":@"question_en"; + NSString *text = object[key]; + CGSize constraint = CGSizeMake(CELL_CONTENT_WIDTH , 20000.0f); + + CGSize size = [text sizeWithFont:[UIFont systemFontOfSize:FONT_SIZE] constrainedToSize:constraint lineBreakMode:NSLineBreakByWordWrapping]; + + CGFloat height = MAX(size.height, CELL_MIN_HEIGHT); + + return height + (CELL_CONTENT_MARGIN * 2); + +} + +- (PFTableViewCell *)tableView:(UITableView *)tableView + cellForRowAtIndexPath:(NSIndexPath *)indexPath + object:(PFObject *)object +{ + AnimalQuestionsCell *cell = [self.tableView dequeueReusableCellWithIdentifier:@"AnimalQuestionsCell"]; + + NSString *key = nil; + NSString *uesrKey = nil; + if(self.postType == ViewerPostTypeQuestion) + { + key = [Helper appLang]==kHebrew? @"question":@"question_en"; + uesrKey = @"user_name"; + cell.iconView.image = [UIImage imageNamed:@"question"]; + }else{ + key = [Helper appLang]==kHebrew? @"text":@"text"; + uesrKey = @"user"; + cell.iconView.image = [UIImage imageNamed:@"postCellIcon"]; + } + cell.labelView.text = object[key]; + cell.detailLableView.text = object[uesrKey]; + return cell; +} + + +- (PFQuery *)queryForTable { + PFQuery *query = [PFQuery queryWithClassName:self.className]; + + query.cachePolicy = kPFCachePolicyCacheThenNetwork; + + [query orderByDescending:@"createdAt"]; + if(self.animal!=nil){ + [query whereKey:@"animal_en_name" equalTo:self.animal.nameEn]; + } + + //NSString *key = [Helper appLang]==kHebrew? @"visible":@"visible_en"; + //[query whereKey:key equalTo:@YES]; + + return query; +} + +#pragma mark MBProgressHUDDelegate methods + +- (void)hudWasHidden:(MBProgressHUD *)hud { + [hud removeFromSuperview]; + hud = nil; +} +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender +{ + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/Files/en.lproj/FunViewController.xib b/Files/en.lproj/FunViewController.xib index 80bd21b..ef8936a 100644 --- a/Files/en.lproj/FunViewController.xib +++ b/Files/en.lproj/FunViewController.xib @@ -1,864 +1,183 @@ - - - - 1552 - 12C3012 - 3084 - 1187.34 - 625.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 2083 - - - IBProxyObject - IBUIButton - IBUIImageView - IBUILabel - IBUIScrollView - IBUIView - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - PluginDependencyRecalculationVersion - - - - - IBFilesOwner - IBCocoaTouchFramework - - - IBFirstResponder - IBCocoaTouchFramework - - - - 274 - - - - 292 - - - - 292 - {{52, 8}, {258, 21}} - - - - _NS:9 - NO - YES - 7 - NO - IBCocoaTouchFramework - Not connected to FaceBook - - 3 - MQA - - - 0 - 10 - - STHeitiTC-Medium - Heiti TC - 2 - 14 - - - STHeitiTC-Medium - 14 - 16 - - - - - 292 - {{9, 4}, {30, 30}} - - - - _NS:9 - NO - IBCocoaTouchFramework - - NSImage - facebook_icon@2x.png - - - - {{0, 4}, {320, 40}} - - - - _NS:9 - - 1 - MC4zNjg2Mjc0NTEgMC41NzY0NzA1ODgyIDAuNjE1Njg2Mjc0NQA - - IBCocoaTouchFramework - - - - 292 - - - - 292 - {{176, 36}, {107, 80}} - - - - _NS:9 - NO - IBCocoaTouchFramework - 0 - 0 - - - 1 - MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - - - 3 - MC41AA - - - NSImage - fun_friend_sign.png - - - 2 - 2 - - - Helvetica-Bold - 18 - 16 - - - - - 292 - {{37, 221}, {107, 80}} - - - - _NS:9 - NO - IBCocoaTouchFramework - 0 - 0 - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - - NSImage - camera.png - - - 2 - 15 - - - Helvetica-Bold - 15 - 16 - - - - - 292 - {{48, 20}, {80, 107}} - - - - _NS:9 - - 3 - MCAwAA - - NO - IBCocoaTouchFramework - 0 - 0 - - - 1 - MC41IDAgMC41AA - - - - NSImage - fun_camera.png - - - - - - - 292 - {{32, 129}, {115, 37}} - - - - _NS:9 - NO - YES - 7 - NO - IBCocoaTouchFramework - Fun Camera - - - 0 - 10 - 4 - 1 - - STHeitiTC-Light - Heiti TC - 0 - 17 - - - STHeitiTC-Light - 17 - 16 - - 115 - - - - 292 - {{33, 304}, {115, 38}} - - - - _NS:9 - NO - YES - 7 - NO - IBCocoaTouchFramework - Zoo Photographer - - - 0 - 10 - 4 - 1 - - - 115 - - - - 292 - {{172, 124}, {115, 54}} - - - - _NS:9 - NO - YES - 7 - NO - IBCocoaTouchFramework - Friend Sign Maker - - - 0 - 10 - 4 - 1 - - - 115 - - - - 292 - {{172, 165}, {115, 41}} - - - - _NS:9 - NO - YES - 7 - NO - IBCocoaTouchFramework - create your own sign and share it - - - 0 - 10 - 4 - 1 - - STHeitiTC-Light - Heiti TC - 0 - 11 - - - STHeitiTC-Light - 11 - 16 - - 115 - - - - 292 - {{31, 158}, {115, 35}} - - - - _NS:9 - NO - YES - 7 - NO - IBCocoaTouchFramework - Snap an animalistic photo and share it - - - 0 - 10 - 4 - 1 - - - 115 - - - - 292 - {{31, 346}, {115, 28}} - - - - _NS:9 - NO - YES - 7 - NO - IBCocoaTouchFramework - Becone a Biblical Zoo photographer - - - 0 - 10 - 4 - 1 - - - 115 - - - - 292 - {{176, 336}, {115, 57}} - - - - _NS:9 - NO - YES - 7 - NO - IBCocoaTouchFramework - Have a question about an animal? Send it to the zoo experts - - - 0 - 10 - 4 - 1 - - - 115 - - - - 292 - {{178, 297}, {115, 54}} - - - - _NS:9 - NO - YES - 7 - NO - IBCocoaTouchFramework - Q&A - - - 0 - 10 - 4 - 1 - - - 115 - - - - 292 - {{195, 208}, {80, 107}} - - - _NS:9 - NO - IBCocoaTouchFramework - 0 - 0 - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - - NSImage - questions.png - - - - - - {{0, 45}, {320, 322}} - - - - _NS:10 - YES - YES - IBCocoaTouchFramework - - - {{0, 64}, {320, 367}} - - - - - 1 - MC4yODI2MDg2OTU3IDAuMjE0MTMyOTU0MyAwLjE3MzEwNzU2MTYAA - - - - NO - - - - IBUIScreenMetrics - - YES - - - - - - {320, 480} - {480, 320} - - - IBCocoaTouchFramework - Retina 3.5 Full Screen - 0 - - IBCocoaTouchFramework - - - - - - - view - - - - 3 - - - - signBtn - - - - 11 - - - - cameraBtn - - - - 10 - - - - animalisticCameraLabel - - - - 31 - - - - signLabel - - - - 32 - - - - questionsButton - - - - 36 - - - - scrollView - - - - 42 - - - - facebookName - - - - 18 - - - - facebookView - - - - 30 - - - - zooCamera - - - - 50 - - - - opsenSignGenerator: - - - 7 - - 13 - - - - openZooPhotographerCamera: - - - 7 - - 43 - - - - openShareCamera: - - - 7 - - 44 - - - - openQuestions: - - - 7 - - 37 - - - - - - 0 - - - - - - 1 - - - - - - - - - -1 - - - File's Owner - - - -2 - - - - - 29 - - - - - - - - - 15 - - - - - 45 - - - - - 41 - - - - - - - - - - - - - - - - - - - 34 - - - - - 39 - - - - - 22 - - - - - 40 - - - - - 21 - - - - - 6 - - - - - 5 - - - - - 4 - - - - - 46 - - - - - 47 - - - - - 48 - - - - - 49 - - - - - - - FunViewController - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - - - - 50 - - - - - FunViewController - UIViewController - - id - id - id - id - - - - openQuestions: - id - - - openShareCamera: - id - - - openZooPhotographerCamera: - id - - - opsenSignGenerator: - id - - - - UILabel - UIButton - UILabel - UIView - UIButton - UIScrollView - UIButton - UILabel - UILabel - UIButton - - - - animalisticCameraLabel - UILabel - - - cameraBtn - UIButton - - - facebookName - UILabel - - - facebookView - UIView - - - questionsButton - UIButton - - - scrollView - UIScrollView - - - signBtn - UIButton - - - signLabel - UILabel - - - simpleCameraLabel - UILabel - - - zooCamera - UIButton - - - - IBProjectSource - ./Classes/FunViewController.h - - - - - 0 - IBCocoaTouchFramework - YES - 3 - - {200, 150} - {60, 60} - {100, 134} - {134, 100} - {100, 134} - - 2083 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Files/en.lproj/SettingsViewController.xib b/Files/en.lproj/SettingsViewController.xib index e1532a6..24b92a9 100644 --- a/Files/en.lproj/SettingsViewController.xib +++ b/Files/en.lproj/SettingsViewController.xib @@ -1,500 +1,104 @@ - - - - 1552 - 12D78 - 3084 - 1187.37 - 626.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 2083 - - - IBProxyObject - IBUIBarButtonItem - IBUIButton - IBUILabel - IBUINavigationBar - IBUINavigationItem - IBUISegmentedControl - IBUIView - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - PluginDependencyRecalculationVersion - - - - - IBFilesOwner - IBCocoaTouchFramework - - - IBFirstResponder - IBCocoaTouchFramework - - - - 274 - - - - 292 - {{20, 100}, {280, 30}} - - - - _NS:9 - - 2 - MC4yOTQxMTc2NTkzIDAuMjExNzY0NzIzMSAwLjE1Njg2Mjc1MDYAA - - NO - IBCocoaTouchFramework - 2 - 2 - 0 - - English - עברית - - - - - - - - - - - {0, 0} - {0, 0} - - - - - - - 1 - MC4yODI2MDg2OTU3IDAuMjE0MTMyOTU0MyAwLjE3MzEwNzU2MTYAA - - - - - 290 - {320, 44} - - - - _NS:9 - IBCocoaTouchFramework - - - - Settings - - close - IBCocoaTouchFramework - 1 - - - IBCocoaTouchFramework - - - - - - 292 - {{20, 267}, {280, 44}} - - - - _NS:9 - - 1 - MC40OTgwMzkyMTU3IDAuNDcwNTg4MjM1MyAwLjM3MjU0OTAxOTYAA - - NO - IBCocoaTouchFramework - 0 - 0 - Send Feedback - - 3 - MQA - - - 2 - MC4zNjg2Mjc0NTg4IDAuMjc0NTA5ODE3NCAwLjIxNTY4NjI5MTUAA - - - 2 - MC4yOTQxMTc2NTkzIDAuMjExNzY0NzIzMSAwLjE1Njg2Mjc1MDYAA - - - 2 - 15 - - - Helvetica-Bold - 15 - 16 - - - - - 292 - {{20, 144}, {280, 44}} - - - - _NS:9 - - 1 - MC43NDExNzY0NzA2IDAuNzAxOTYwNzg0MyAwLjU0OTAxOTYwNzgAA - - NO - IBCocoaTouchFramework - 0 - 0 - Share This App - - - 2 - MC4zNjg2Mjc0NTg4IDAuMjc0NTA5ODE3NCAwLjIxNTY4NjI5MTUAA - - - 2 - MC4yOTQxMTc2NTkzIDAuMjExNzY0NzIzMSAwLjE1Njg2Mjc1MDYAA - - - - - - - 292 - {{20, 205}, {280, 44}} - - - - _NS:9 - - 1 - MC4zODQzMTM3MjU1IDAuNDUwOTgwMzkyMiAwLjQzNTI5NDExNzYAA - - NO - IBCocoaTouchFramework - 0 - 0 - Rate This App - - - - 2 - MC4yOTQxMTc2NTkzIDAuMjExNzY0NzIzMSAwLjE1Njg2Mjc1MDYAA - - - - - - - 292 - {{20, 61}, {280, 31}} - - - - _NS:9 - NO - YES - 7 - NO - IBCocoaTouchFramework - Select the App language: - - 2 - MSAxIDEAA - - - 0 - 2 - - Futura-Medium - Futura - 0 - 14 - - - Futura-Medium - 14 - 16 - - NO - 280 - - - {{0, 20}, {320, 548}} - - - - - 1 - MC4yODI2MDg2OTU3IDAuMjE0MTMyOTU0MyAwLjE3MzEwNzU2MTYAA - - - - IBUIScreenMetrics - - YES - - - - - - {320, 568} - {568, 320} - - - IBCocoaTouchFramework - Retina 4 Full Screen - 2 - - IBCocoaTouchFramework - - - - - - - view - - - - 3 - - - - langSelector - - - - 29 - - - - changedLang: - - - 13 - - 32 - - - - close: - - - - 36 - - - - emailUs: - - - 7 - - 47 - - - - shareApp: - - - 7 - - 49 - - - - rateApp: - - - 7 - - 48 - - - - - - 0 - - - - - - 1 - - - - - - - - - - - - - -1 - - - File's Owner - - - -2 - - - - - 4 - - - - - 33 - - - - - - - - 34 - - - - - - - - 35 - - - - - 39 - - - - - 40 - - - - - 43 - - - - - 45 - - - - - - - SettingsViewController - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - - - - 49 - - - - - SettingsViewController - UIViewController - - UISegmentedControl - id - id - id - id - id - - - - changedLang: - UISegmentedControl - - - close: - id - - - emailUs: - id - - - rateApp: - id - - - restorePurchase: - id - - - shareApp: - id - - - - UISegmentedControl - UIButton - - - - langSelector - UISegmentedControl - - - restoreButton - UIButton - - - - IBProjectSource - ./Classes/SettingsViewController.h - - - - - 0 - IBCocoaTouchFramework - YES - 3 - 2083 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Files/jerusalemBiblicalZoo.xcdatamodeld/jerusalemBiblicalZoo.xcdatamodel/contents b/Files/jerusalemBiblicalZoo.xcdatamodeld/jerusalemBiblicalZoo.xcdatamodel/contents index 2de0791..361a8d2 100644 --- a/Files/jerusalemBiblicalZoo.xcdatamodeld/jerusalemBiblicalZoo.xcdatamodel/contents +++ b/Files/jerusalemBiblicalZoo.xcdatamodeld/jerusalemBiblicalZoo.xcdatamodel/contents @@ -1,5 +1,5 @@ - + diff --git a/Files/main.m b/Files/main.m index 2cd8558..9c2714e 100644 --- a/Files/main.m +++ b/Files/main.m @@ -2,11 +2,10 @@ // Copyright 2011 Ping Labs, Inc. All rights reserved. #import - -int main(int argc, char *argv[]) -{ +#import "JerusalemBiblicalZooAppDelegate.h" +int main(int argc, char *argv[]) { + @autoreleasepool { - int retVal = UIApplicationMain(argc, argv, nil, nil); - return retVal; + return UIApplicationMain(argc, argv, nil, NSStringFromClass([JerusalemBiblicalZooAppDelegate class])); } -} +} \ No newline at end of file