Permalink
Browse files

enlarged close button radius, re-aligned about screen text

  • Loading branch information...
1 parent 5ada1dc commit a4e51c639f003aa535b9a96acc6774641d2c3a4a @xirianlight xirianlight committed Mar 28, 2013
Showing with 70 additions and 43 deletions.
  1. +11 −0 MappingMashupApp/FlickrMapViewController.m
  2. +59 −43 MappingMashupApp/en.lproj/MainStoryboard.storyboard
@@ -44,6 +44,7 @@ @interface FlickrMapViewController ()
}
- (IBAction)fullSizedPhotoTapped:(id)sender;
- (IBAction)infoButtonPressed:(id)sender;
+- (IBAction)largerClosePhotoButtonPressed:(id)sender;
- (IBAction)closePhotoButtonPressed:(id)sender;
@@ -491,6 +492,16 @@ - (IBAction)fullSizedPhotoTapped:(id)sender
- (IBAction)infoButtonPressed:(id)sender {
}
+- (IBAction)largerClosePhotoButtonPressed:(id)sender
+{
+ if (didSelectThumbnail == YES)
+ {
+ [enlargedPhotoViewOutlet raiseImageView];
+ }
+
+ didSelectThumbnail = NO;
+}
+
- (IBAction)closePhotoButtonPressed:(id)sender
{
if (didSelectThumbnail == YES) {
@@ -78,7 +78,7 @@
</connections>
</button>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" id="UAD-fW-jEe">
- <rect key="frame" x="20" y="124" width="280" height="360"/>
+ <rect key="frame" x="20" y="137" width="280" height="347"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<string key="text">Wi-Where is a project developed by the four peanuts you see above this very text. Our goal was to let a user discover new places to connect through a visual browsing experience. When you want to get online out of the house, you find yourself at cafés, restaurants, parks - and more often than not, the same ones over and over again. What if you had some sort of insight as to the environment around new destinations before you left? Using Wi-Where, you can see interesting pictures taken around these locales that provide complimentary wifi access to make sure you find one that will suit your taste.</string>
@@ -188,6 +188,63 @@
<outlet property="delegate" destination="L5I-mE-d7D" id="xGQ-az-UrA"/>
</connections>
</mapView>
+ <view contentMode="scaleToFill" id="OOa-i0-nDV">
+ <rect key="frame" x="10" y="-184" width="300" height="185"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <subviews>
+ <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" id="O4r-WJ-Sly">
+ <rect key="frame" x="5" y="5" width="290" height="175"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ </imageView>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="kbm-YI-FPA">
+ <rect key="frame" x="0.0" y="0.0" width="266" height="186"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+ <state key="normal">
+ <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>
+ <connections>
+ <action selector="fullSizedPhotoTapped:" destination="L5I-mE-d7D" eventType="touchUpInside" id="GwE-2G-FJ9"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="jyC-X8-tkC">
+ <rect key="frame" x="261" y="0.0" width="39" height="41"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+ <state key="normal">
+ <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>
+ <connections>
+ <action selector="largerClosePhotoButtonPressed:" destination="L5I-mE-d7D" eventType="touchUpInside" id="oWB-ih-hbL"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="l7g-9r-gcH">
+ <rect key="frame" x="268" y="-2" width="34" height="34"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+ <state key="normal" image="closeButton@2x.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>
+ <connections>
+ <action selector="closePhotoButtonPressed:" destination="L5I-mE-d7D" eventType="touchUpInside" id="NhX-y6-FHl"/>
+ </connections>
+ </button>
+ </subviews>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+ </view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="infoDark" showsTouchWhenHighlighted="YES" lineBreakMode="middleTruncation" id="WIM-HQ-xLH">
<rect key="frame" x="291" y="465.5" width="18" height="19"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -238,48 +295,6 @@
<rect key="frame" x="0.0" y="-25" width="320" height="50"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
- <view contentMode="scaleToFill" id="OOa-i0-nDV">
- <rect key="frame" x="10" y="-184.5" width="300" height="185"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <subviews>
- <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" id="O4r-WJ-Sly">
- <rect key="frame" x="5" y="5" width="290" height="175"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
- </imageView>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="l7g-9r-gcH">
- <rect key="frame" x="268.5" y="-2.5" width="34" height="34"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
- <state key="normal" image="closeButton@2x.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>
- <connections>
- <action selector="closePhotoButtonPressed:" destination="L5I-mE-d7D" eventType="touchUpInside" id="NhX-y6-FHl"/>
- </connections>
- </button>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="kbm-YI-FPA">
- <rect key="frame" x="0.0" y="0.0" width="266" height="186"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
- <state key="normal">
- <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>
- <connections>
- <action selector="fullSizedPhotoTapped:" destination="L5I-mE-d7D" eventType="touchUpInside" id="GwE-2G-FJ9"/>
- </connections>
- </button>
- </subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
- </view>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
</view>
@@ -577,6 +592,7 @@
<relationship kind="action" name="closePhotoButtonPressed:"/>
<relationship kind="action" name="fullSizedPhotoTapped:"/>
<relationship kind="action" name="infoButtonPressed:"/>
+ <relationship kind="action" name="largerClosePhotoButtonPressed:"/>
<relationship kind="outlet" name="bioLabel" candidateClass="UILabel"/>
<relationship kind="outlet" name="bioScrollView" candidateClass="UIScrollView"/>
<relationship kind="outlet" name="enlargedPhotoViewOutlet" candidateClass="UIView"/>

0 comments on commit a4e51c6

Please sign in to comment.