cleaning up previous commits

This commit is contained in:
Roy Yang 2012-06-09 09:38:32 -07:00
parent 456d5bbf34
commit 2bfdbade7d
2 changed files with 3 additions and 14 deletions

View file

@ -49,7 +49,6 @@
[addFolderInput setLeftView:folderImage2];
[addFolderInput setLeftViewMode:UITextFieldViewModeAlways];
[folderImage2 release];
UIImageView *urlImage = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"world.png"]];
[siteAddressInput setLeftView:urlImage];
[siteAddressInput setLeftViewMode:UITextFieldViewModeAlways];
@ -57,14 +56,6 @@
navBar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9];
NSLog(@"The self.view.frame.size.width is %f", self.view.frame.size.width);
if(UIInterfaceOrientationIsPortrait(self.interfaceOrientation)) {
NSLog(@"portrait");
} else {
NSLog(@"landscape");
}
addFolderInput.frame = CGRectMake(UIInterfaceOrientationIsPortrait(self.interfaceOrientation) ? self.view.frame.size.width : self.view.frame.size.height,
siteAddressInput.frame.origin.y,
siteAddressInput.frame.size.width,

View file

@ -251,13 +251,12 @@
[self calculateFeedLocations:YES];
[self.feedTitlesTable reloadData];
NSString *serveriPhoneVersion = [results objectForKey:@"iphone_version"];
NSString *serveriPhoneVersion = [results objectForKey:@"iphone_version"];
NSString *currentiPhoneVersion = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"];
float serveriPhoneVersionFloat = [serveriPhoneVersion floatValue];
float currentiPhoneVersionFloat = [currentiPhoneVersion floatValue];
//NSLog(@"serveriPhoneVersionFloat: %f and currentiPhoneVersionFloat: %f", serveriPhoneVersionFloat, currentiPhoneVersionFloat);
if (currentiPhoneVersionFloat < serveriPhoneVersionFloat) {
NSLog(@"Version: %f - %f", serveriPhoneVersionFloat, currentiPhoneVersionFloat);
NSString *title = [NSString stringWithFormat:@"You should download the new version of NewsBlur.\n\nNew version: v%@\nYou have: v%@", serveriPhoneVersion, currentiPhoneVersion];
@ -469,12 +468,11 @@
int headerLabelHeight, folderImageViewY, disclosureImageViewY;
// set up layout values based on iPad/iPhone
if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad){
if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) {
headerLabelHeight = 30;
folderImageViewY = 7;
disclosureImageViewY = 8;
}else{
} else {
headerLabelHeight = 20;
folderImageViewY = 2;
disclosureImageViewY = 3;