From 380de81e7b0d0be7a1fcf0b88cbcdce7d9faa1db Mon Sep 17 00:00:00 2001 From: Roy Yang Date: Sun, 15 Jul 2012 23:04:26 -0700 Subject: [PATCH] removing reloaddata that led to worst bug ever --- media/ios/Classes/FeedDetailViewController.m | 1 - media/ios/Classes/ProfileBadge.m | 4 ++-- media/ios/NewsBlur.xcodeproj/project.pbxproj | 4 ++++ media/ios/Resources/7-location-place.png | Bin 0 -> 987 bytes 4 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 media/ios/Resources/7-location-place.png diff --git a/media/ios/Classes/FeedDetailViewController.m b/media/ios/Classes/FeedDetailViewController.m index 1f62a941d..3bd7340ae 100644 --- a/media/ios/Classes/FeedDetailViewController.m +++ b/media/ios/Classes/FeedDetailViewController.m @@ -150,7 +150,6 @@ self.pageFetching = NO; self.pageFinished = NO; self.feedPage = 1; - [self.storyTitlesTable reloadData]; } #pragma mark - diff --git a/media/ios/Classes/ProfileBadge.m b/media/ios/Classes/ProfileBadge.m index 549aebbe4..6d4f7f06a 100644 --- a/media/ios/Classes/ProfileBadge.m +++ b/media/ios/Classes/ProfileBadge.m @@ -169,7 +169,7 @@ // LOCATION if ([profile objectForKey:@"location"] != [NSNull null]) { UILabel *location = [[UILabel alloc] - initWithFrame:CGRectMake(kTopBadgeTextXCoordinate + 20, + initWithFrame:CGRectMake(kTopBadgeTextXCoordinate + 16, yCoordinatePointer, 190, 20)]; @@ -180,7 +180,7 @@ self.userLocation = location; [self addSubview:self.userLocation]; - UIImage *locationIcon = [UIImage imageNamed:@"flag_orange.png"]; + UIImage *locationIcon = [UIImage imageNamed:@"7-location-place.png"]; UIImageView *locationIconView = [[UIImageView alloc] initWithImage:locationIcon]; locationIconView.Frame = CGRectMake(kTopBadgeTextXCoordinate, yCoordinatePointer + 2, diff --git a/media/ios/NewsBlur.xcodeproj/project.pbxproj b/media/ios/NewsBlur.xcodeproj/project.pbxproj index f4b621093..7956ce4b0 100755 --- a/media/ios/NewsBlur.xcodeproj/project.pbxproj +++ b/media/ios/NewsBlur.xcodeproj/project.pbxproj @@ -166,6 +166,7 @@ 43B8F029156603180008733D /* NewsBlurViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 43B8F01F156603170008733D /* NewsBlurViewController.xib */; }; 43B8F02A156603180008733D /* OriginalStoryViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 43B8F020156603170008733D /* OriginalStoryViewController.xib */; }; 43B8F02B156603180008733D /* StoryDetailViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 43B8F021156603170008733D /* StoryDetailViewController.xib */; }; + 43C1680B15B3D99B00428BA3 /* 7-location-place.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C1680A15B3D99B00428BA3 /* 7-location-place.png */; }; 43C95C3F158BCDD70086C69B /* 19-circle-check.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C95C3D158BCDD70086C69B /* 19-circle-check.png */; }; 43C95C40158BCDD70086C69B /* 19-circle-check@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C95C3E158BCDD70086C69B /* 19-circle-check@2x.png */; }; 43C95C42158BD13D0086C69B /* category_selected_background.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C95C41158BD13D0086C69B /* category_selected_background.png */; }; @@ -454,6 +455,7 @@ 43B8F01F156603170008733D /* NewsBlurViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NewsBlurViewController.xib; sourceTree = ""; }; 43B8F020156603170008733D /* OriginalStoryViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = OriginalStoryViewController.xib; sourceTree = ""; }; 43B8F021156603170008733D /* StoryDetailViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = StoryDetailViewController.xib; sourceTree = ""; }; + 43C1680A15B3D99B00428BA3 /* 7-location-place.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "7-location-place.png"; sourceTree = ""; }; 43C95C3D158BCDD70086C69B /* 19-circle-check.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "19-circle-check.png"; sourceTree = ""; }; 43C95C3E158BCDD70086C69B /* 19-circle-check@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "19-circle-check@2x.png"; sourceTree = ""; }; 43C95C41158BD13D0086C69B /* category_selected_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = category_selected_background.png; sourceTree = ""; }; @@ -896,6 +898,7 @@ 431B857615A132B600DCE497 /* Images */ = { isa = PBXGroup; children = ( + 43C1680A15B3D99B00428BA3 /* 7-location-place.png */, 43F6A79815B0C57F0092EE91 /* flag_orange.png */, 43A4C3E715B00A26008787B5 /* 06-arrow-south.png */, 43A4C3E815B00A26008787B5 /* 06-arrow-south@2x.png */, @@ -1671,6 +1674,7 @@ 43A4C49C15B00A26008787B5 /* world.png in Resources */, 43A4C49E15B00CD3008787B5 /* Entitlements.entitlements in Resources */, 43F6A79915B0C57F0092EE91 /* flag_orange.png in Resources */, + 43C1680B15B3D99B00428BA3 /* 7-location-place.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/media/ios/Resources/7-location-place.png b/media/ios/Resources/7-location-place.png new file mode 100644 index 0000000000000000000000000000000000000000..32826336c9bc369ad0f977bb77b9fe8871fed3f9 GIT binary patch literal 987 zcmV<110?*3P)H=t0OeK5ia7=-KQx3^YC6RbNk6RafmgzV8#) z`uqE-qPai^a1uBLoY43>@C*12`~kc;LDSRIvC7ieX}!Qz;EI49Z3Kb(+Q2L@1LPW2 z*eG~6a8JO;fC5mea1sD#w87ijz$mbK5a0vA1DQt=*om3%X-*cn4qO7B0&klMehYXg zlgQV&*3)woc&w9pSt~%Q4(J=eBlY(iII(?g{Jvx+3Vse4l0wgdQwK7JBs($iK^<)| zW}YM2DfLaQD4ByvfV)5+a8Z%NBrl^cxvR(1m`PVbvim|&$cl5G2Ce~z1QWHn67UL` z428OG;HDyp8)0HTa9BFFfE8Qd7l0mvT?gjy445c;m(#PN@aYJ&lD+px*NQDu=>@tB z;91~J1?X^_(44HnQM;tenvHh=M=IQk!PnjgrmB!L6$*pptt1^CHo-e(gMNfDaajz5)D=nC}6{N|F?rCAWG9v#F6su%V6SB)b1~^cVpL9)wE&%!tkGsvKzY@Q`D#;8gNcM? zB@P~h#}OT~Q^$HoYeyuDW`PHeI#Z{;XS8;#UgeE|`@nPk(37bVdR=S%g8&aMrWXQm zsx%Q_YgQXkoU#xZCV{ycvcoy8;h@0*#({q^QO4DraT^M4fiD0bV{AR6ISZ`>9+=E- zgsnSzH)%_mP4GqK?dgbQE?4Wd-YoDE@Gip6UA-%{A~?X3su;IIWwT^ck!|pwN}4id zPPwdiEennc4o?ml{Hi-|TS*e&A5<6w;5!;?dGIaOjls{%YZ_~La1Z#T5SUiqYX@*b z6@Gc&T1zJc9{d>_^xF!2vmL>Al?ev@wgD$(DzqE;>m