From 56dcefd1ee7419d7dc0d1faaddad8ccd3adf097f Mon Sep 17 00:00:00 2001
From: Roy Yang <roycyang@gmail.com>
Date: Wed, 20 Jun 2012 08:42:19 -0700
Subject: [PATCH] changing tags to CONSTANTS and adding detail view logic

---
 media/iphone/Classes/NewsBlurAppDelegate.h       |  4 ++++
 media/iphone/Classes/NewsBlurAppDelegate.m       | 16 ++++++++--------
 media/iphone/Classes/NewsBlurViewController.m    |  2 +-
 media/iphone/Classes/StoryDetailViewController.m |  4 ++--
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/media/iphone/Classes/NewsBlurAppDelegate.h b/media/iphone/Classes/NewsBlurAppDelegate.h
index 416852dc3..ddaa78043 100644
--- a/media/iphone/Classes/NewsBlurAppDelegate.h
+++ b/media/iphone/Classes/NewsBlurAppDelegate.h
@@ -9,6 +9,10 @@
 #import <UIKit/UIKit.h>
 #import "BaseViewController.h"
 
+#define FEED_DETAIL_VIEW_TAG 1000001
+#define STORY_DETAIL_VIEW_TAG 1000002
+#define FEED_TITLE_GRADIENT_TAG 100003
+
 @class NewsBlurViewController;
 @class FeedDetailViewController;
 @class FeedsMenuViewController;
diff --git a/media/iphone/Classes/NewsBlurAppDelegate.m b/media/iphone/Classes/NewsBlurAppDelegate.m
index dc5935ac1..f70ecc634 100644
--- a/media/iphone/Classes/NewsBlurAppDelegate.m
+++ b/media/iphone/Classes/NewsBlurAppDelegate.m
@@ -224,7 +224,7 @@
         [splitStoryDetailViewController showPopover];
         NSArray *subviews = [[splitStoryDetailViewController.view subviews] copy];
         for (UIView *subview in subviews) {
-            if (subview.tag == 14) {
+            if (subview.tag == FEED_DETAIL_VIEW_TAG) {
                 [subview removeFromSuperview];
             }
         }
@@ -259,13 +259,13 @@
         // remove existing feedDetailViewController
         NSArray *subviews = [[splitStoryDetailViewController.view subviews] copy];
         for (UIView *subview in subviews) {
-            if (subview.tag == 14) {
+            if (subview.tag == FEED_DETAIL_VIEW_TAG || subview.tag == STORY_DETAIL_VIEW_TAG) {
                 [subview removeFromSuperview];
             }
         }
         [subviews release];
         
-        feedDetailViewController.view.tag = 14;
+        feedDetailViewController.view.tag = FEED_DETAIL_VIEW_TAG;
         [splitStoryDetailViewController.view addSubview:feedDetailViewController.view];
         
         [self adjustStoryDetailWebView];
@@ -294,13 +294,13 @@
         // remove existing feedDetailViewController
         NSArray *subviews = [[splitStoryDetailViewController.view subviews] copy];
         for (UIView *subview in subviews) {
-            if (subview.tag == 14) {
+            if (subview.tag == FEED_DETAIL_VIEW_TAG) {
                 [subview removeFromSuperview];
             }
         }
         [subviews release];
         
-        feedDetailViewController.view.tag = 14;
+        feedDetailViewController.view.tag = FEED_DETAIL_VIEW_TAG;
         [splitStoryDetailViewController.view addSubview:feedDetailViewController.view];
         
         [self adjustStoryDetailWebView];
@@ -348,7 +348,7 @@
         // remove existing feedDetailViewController
         NSArray *subviews = [[splitStoryDetailViewController.view subviews] copy];
         for (UIView *subview in subviews) {
-            if (subview.tag == 14) {
+            if (subview.tag == FEED_DETAIL_VIEW_TAG) {
                 [subview removeFromSuperview];
             }
         }
@@ -396,13 +396,13 @@
         // With some valid UIView *view:
         NSArray *subviews = [[splitStoryDetailViewController.view subviews] copy];
         for (UIView *subview in subviews) {
-            if (subview.tag == 12) {
+            if (subview.tag == STORY_DETAIL_VIEW_TAG) {
                 [subview removeFromSuperview];
             }
         }
         [subviews release];
         
-        storyDetailViewController.view.tag = 12;
+        storyDetailViewController.view.tag = STORY_DETAIL_VIEW_TAG;
         [splitStoryDetailViewController.view addSubview:storyDetailViewController.view];
         [self adjustStoryDetailWebView];
 
diff --git a/media/iphone/Classes/NewsBlurViewController.m b/media/iphone/Classes/NewsBlurViewController.m
index 50a640fd1..82024fd24 100644
--- a/media/iphone/Classes/NewsBlurViewController.m
+++ b/media/iphone/Classes/NewsBlurViewController.m
@@ -115,7 +115,7 @@
 //    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad){
 //        NSArray *subviews = [[appDelegate.splitStoryDetailViewController.view subviews] copy];
 //        for (UIView *subview in subviews) {
-//            if (subview.tag == 12) {
+//            if (subview.tag == STORY_DETAIL_VIEW_TAG) {
 //                [subview removeFromSuperview];
 //            }
 //        }
diff --git a/media/iphone/Classes/StoryDetailViewController.m b/media/iphone/Classes/StoryDetailViewController.m
index b881867d1..689122363 100644
--- a/media/iphone/Classes/StoryDetailViewController.m
+++ b/media/iphone/Classes/StoryDetailViewController.m
@@ -235,9 +235,9 @@
     self.feedTitleGradient = [appDelegate makeFeedTitleGradient:feed 
                                  withRect:CGRectMake(0, -1, 1024, 21)]; // 1024 hack for self.webView.frame.size.width
     
-    self.feedTitleGradient.tag = 12; // Not attached yet. Remove old gradients, first.
+    self.feedTitleGradient.tag = FEED_TITLE_GRADIENT_TAG; // Not attached yet. Remove old gradients, first.
     for (UIView *subview in self.webView.subviews) {
-        if (subview.tag == 12) {
+        if (subview.tag == FEED_TITLE_GRADIENT_TAG) {
             [subview removeFromSuperview];
         }
     }