On second thought, the compass button isn't needed

zachwill · Apr 30, 2012 · e0b2f2f · e0b2f2f
1 parent eac6ae7
commit e0b2f2f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 21 deletions.
diff --git a/Beautiful Maps/BeautifulMapsDataViewController.h b/Beautiful Maps/BeautifulMapsDataViewController.h
@@ -12,6 +12,6 @@
 
 @property (strong, nonatomic) id dataObject;
 @property (weak, nonatomic) IBOutlet UIImageView *imageView;
-@property (weak, nonatomic) IBOutlet UIButton *compassButton;
+- (IBAction)moreInfo:(id)sender;
 
 @end
diff --git a/Beautiful Maps/BeautifulMapsDataViewController.m b/Beautiful Maps/BeautifulMapsDataViewController.m
@@ -14,7 +14,6 @@ @interface BeautifulMapsDataViewController ()
 
 @implementation BeautifulMapsDataViewController
 @synthesize imageView;
-@synthesize compassButton;
 
 - (void)viewDidLoad
 {
@@ -23,7 +22,6 @@ - (void)viewDidLoad
     NSString *city = [[self.dataObject description] lowercaseString];
     NSString *imageName = [NSString stringWithFormat:@"%@.png", city];
     self.imageView.image = [UIImage imageNamed:imageName];
-    [compassButton setShowsTouchWhenHighlighted:YES];
 }
 
 - (void)viewWillAppear:(BOOL)animated
@@ -36,9 +34,6 @@ - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interface
     return UIInterfaceOrientationIsLandscape(interfaceOrientation);
 }
 
-- (void)viewDidUnload {
-    [self setImageView:nil];
-    [self setCompassButton:nil];
-    [super viewDidUnload];
+- (IBAction)moreInfo:(id)sender {
 }
 @end
diff --git a/Beautiful Maps/en.lproj/MainStoryboard.storyboard b/Beautiful Maps/en.lproj/MainStoryboard.storyboard
@@ -34,18 +34,6 @@
                                 <rect key="frame" x="0.0" y="0.0" width="768" height="1004"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             </imageView>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="IFc-lZ-jub">
-                                <rect key="frame" x="10" y="947" width="44" height="37"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
-                                <state key="normal" image="compass.png">
-                                    <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
-                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                </state>
-                                <state key="highlighted">
-                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                </state>
-                            </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="infoLight" showsTouchWhenHighlighted="YES" lineBreakMode="middleTruncation" id="Bs2-SM-biy">
                                 <rect key="frame" x="730" y="956" width="18" height="19"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
@@ -57,12 +45,14 @@
                                 <state key="highlighted">
                                     <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
+                                <connections>
+                                    <action selector="moreInfo:" destination="5" eventType="touchUpInside" id="VCU-WS-gzk"/>
+                                </connections>
                             </button>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                     </view>
                     <connections>
-                        <outlet property="compassButton" destination="IFc-lZ-jub" id="WxW-QP-hHL"/>
                         <outlet property="imageView" destination="X02-J7-TWR" id="Off-zt-9MJ"/>
                     </connections>
                 </viewController>
@@ -71,9 +61,20 @@
         </scene>
     </scenes>
     <resources>
-        <image name="compass.png" width="20" height="20"/>
         <image name="manhattan.png" width="2048" height="1536"/>
     </resources>
+    <classes>
+        <class className="BeautifulMapsDataViewController" superclassName="UIViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/BeautifulMapsDataViewController.h"/>
+            <relationships>
+                <relationship kind="action" name="moreInfo:"/>
+                <relationship kind="outlet" name="imageView" candidateClass="UIImageView"/>
+            </relationships>
+        </class>
+        <class className="BeautifulMapsRootViewController" superclassName="UIViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/BeautifulMapsRootViewController.h"/>
+        </class>
+    </classes>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar" statusBarStyle="blackTranslucent"/>
         <simulatedOrientationMetrics key="orientation"/>