Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

resolving conflicts for major UI update

  • Loading branch information...
commit e631e8b78f6a772135816669db2ac4b85127989d 2 parents 86814c6 + d645c21
@xirianlight xirianlight authored
View
22 MappingMashupApp.xcodeproj/project.pbxproj
@@ -23,6 +23,10 @@
8335571916F754C800DB17D5 /* xmark.png in Resources */ = {isa = PBXBuildFile; fileRef = 8335571816F754C800DB17D5 /* xmark.png */; };
8335571D16F7579600DB17D5 /* wifiIcon2@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8335571C16F7579600DB17D5 /* wifiIcon2@2x.png */; };
835876D817014080000A74A7 /* circleShine@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 835876D717014080000A74A7 /* circleShine@2x.png */; };
+ 835CB1AE17025521009190FA /* backArrow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 835CB1AD17025521009190FA /* backArrow@2x.png */; };
+ 835CB1B01702558B009190FA /* forwardArrow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 835CB1AF1702558B009190FA /* forwardArrow@2x.png */; };
+ 836B861D1702479600B593A4 /* addBookmarkButton@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 836B861C1702479600B593A4 /* addBookmarkButton@2x.png */; };
+ 836B862317024F1700B593A4 /* addBookmarkC@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 836B862217024F1700B593A4 /* addBookmarkC@2x.png */; };
837D9F1F1701F56700565291 /* appIcon114x114.png in Resources */ = {isa = PBXBuildFile; fileRef = 837D9F1E1701F56700565291 /* appIcon114x114.png */; };
83B0D00516FA1A1900C9D8F8 /* BookmarksViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 83B0D00416FA1A1900C9D8F8 /* BookmarksViewController.m */; };
83B0D00A16FA1A8900C9D8F8 /* HistoryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 83B0D00916FA1A8900C9D8F8 /* HistoryViewController.m */; };
@@ -103,6 +107,10 @@
8335571816F754C800DB17D5 /* xmark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = xmark.png; sourceTree = "<group>"; };
8335571C16F7579600DB17D5 /* wifiIcon2@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "wifiIcon2@2x.png"; sourceTree = "<group>"; };
835876D717014080000A74A7 /* circleShine@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "circleShine@2x.png"; sourceTree = "<group>"; };
+ 835CB1AD17025521009190FA /* backArrow@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "backArrow@2x.png"; path = "MappingMashupApp/backArrow@2x.png"; sourceTree = "<group>"; };
+ 835CB1AF1702558B009190FA /* forwardArrow@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "forwardArrow@2x.png"; path = "MappingMashupApp/forwardArrow@2x.png"; sourceTree = "<group>"; };
+ 836B861C1702479600B593A4 /* addBookmarkButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "addBookmarkButton@2x.png"; path = "MappingMashupApp/addBookmarkButton@2x.png"; sourceTree = "<group>"; };
+ 836B862217024F1700B593A4 /* addBookmarkC@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "addBookmarkC@2x.png"; path = "MappingMashupApp/addBookmarkC@2x.png"; sourceTree = "<group>"; };
837D9F1E1701F56700565291 /* appIcon114x114.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = appIcon114x114.png; sourceTree = "<group>"; };
83B0D00316FA1A1900C9D8F8 /* BookmarksViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BookmarksViewController.h; sourceTree = "<group>"; };
83B0D00416FA1A1900C9D8F8 /* BookmarksViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BookmarksViewController.m; sourceTree = "<group>"; };
@@ -118,7 +126,7 @@
83E3AE8F16FA687A00A8F27E /* webviewpopout_shelf@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "webviewpopout_shelf@2x.png"; sourceTree = "<group>"; };
83FE37E016F76CD6000C9935 /* FlickrMapViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FlickrMapViewController.h; sourceTree = "<group>"; };
83FE37E116F76CD6000C9935 /* FlickrMapViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FlickrMapViewController.m; sourceTree = "<group>"; };
- 8F372B0016F244C800302B80 /* MappingMashupApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; name = MappingMashupApp.app; path = "Wi-Where.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+ 8F372B0016F244C800302B80 /* Wi-Where.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Wi-Where.app"; sourceTree = BUILT_PRODUCTS_DIR; };
8F372B0316F244C800302B80 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
8F372B0516F244C800302B80 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
8F372B0716F244C800302B80 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -204,7 +212,7 @@
8F372B0116F244C800302B80 /* Products */ = {
isa = PBXGroup;
children = (
- 8F372B0016F244C800302B80 /* MappingMashupApp.app */,
+ 8F372B0016F244C800302B80 /* Wi-Where.app */,
);
name = Products;
sourceTree = "<group>";
@@ -319,6 +327,10 @@
8F3AD83816F90A0300BEEB3A /* Custom Images */ = {
isa = PBXGroup;
children = (
+ 835CB1AF1702558B009190FA /* forwardArrow@2x.png */,
+ 835CB1AD17025521009190FA /* backArrow@2x.png */,
+ 836B862217024F1700B593A4 /* addBookmarkC@2x.png */,
+ 836B861C1702479600B593A4 /* addBookmarkButton@2x.png */,
835876D717014080000A74A7 /* circleShine@2x.png */,
830E6BB8170135AE009FBD5B /* appIcon@2x.png */,
830E6BB9170135AE009FBD5B /* silverBG@2x.png */,
@@ -388,7 +400,7 @@
);
name = "Wi-Where";
productName = MappingMashupApp;
- productReference = 8F372B0016F244C800302B80 /* MappingMashupApp.app */;
+ productReference = 8F372B0016F244C800302B80 /* Wi-Where.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
@@ -467,6 +479,10 @@
830E6BBB170135AE009FBD5B /* silverBG@2x.png in Resources */,
835876D817014080000A74A7 /* circleShine@2x.png in Resources */,
837D9F1F1701F56700565291 /* appIcon114x114.png in Resources */,
+ 836B861D1702479600B593A4 /* addBookmarkButton@2x.png in Resources */,
+ 836B862317024F1700B593A4 /* addBookmarkC@2x.png in Resources */,
+ 835CB1AE17025521009190FA /* backArrow@2x.png in Resources */,
+ 835CB1B01702558B009190FA /* forwardArrow@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
1  MappingMashupApp/FlickrMapViewController.m
@@ -71,6 +71,7 @@ - (void)viewDidLoad
//Add bookmarks button to viewController
self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemBookmarks target:self action:@selector(bookmarkButtonPressed)];
+
NSDate *future = [NSDate dateWithTimeIntervalSinceNow: 2 ];
[NSThread sleepUntilDate:future];
//Created method "bookmarkButtonPressed, currently has no action - End edit
View
47 MappingMashupApp/YelpWebPageBrowser.m
@@ -18,11 +18,14 @@ @interface YelpWebPageBrowser ()
__weak IBOutlet UIView *popoutView;
__weak IBOutlet UILabel *popoutViewTextLabel;
__weak IBOutlet UIWebView *webView;
- Business *currentBusiness;
-
+ Business *currentBusiness;
+ __weak IBOutlet UIButton *backButton;
+ __weak IBOutlet UIButton *forwardButton;
}
//Add buttons for left/right here
+- (IBAction)backButtonPress:(id)sender;
+- (IBAction)forwardButtonPress:(id)sender;
@end
@@ -55,7 +58,8 @@ - (void)viewDidLoad
currentBusiness = [self fetchBusinessShownInWebpage];
//Adds bookmark button to top right corner
- self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAdd target:self action:@selector(addBookmark)];
+ //self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAdd target:self action:@selector(addBookmark)];
+ self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"addBookmarkC"] style:UIBarButtonItemStyleBordered target:self action:@selector(addBookmark)];
//Enable button just in case
[self.navigationItem.rightBarButtonItem setEnabled:YES];
@@ -98,12 +102,35 @@ - (void)viewDidLoad
NSLog(@"Done!");
}];
-
-
+ backButton.enabled = NO;
+ forwardButton.enabled = NO;
+
+
//End of method bracket
}
+- (void)webViewDidFinishLoad:(UIWebView *)webView
+{
+ //Code to manage back/forward buttons
+ if ([webView canGoBack] == NO)
+ {
+ backButton.enabled = NO;
+ }
+ else
+ {
+ backButton.enabled = YES;
+ }
+
+ if ([webView canGoForward] == NO)
+ {
+ forwardButton.enabled = NO;
+ }
+ else
+ {
+ forwardButton.enabled = YES;
+ }
+}
-(void)fetchToSeeIfCurrentBusinessIsBookmarkedAndSetButtonDisabled
{
@@ -252,15 +279,15 @@ - (void)didReceiveMemoryWarning
// Dispose of any resources that can be recreated.
}
-//Swipe gestures to go forwards, back
-- (IBAction)swipeLeftAction:(id)sender {
- [webView goForward];
-}
+//Button presses to go back and forward
-- (IBAction)swipeRightAction:(id)sender {
+- (IBAction)backButtonPress:(id)sender {
[webView goBack];
}
+- (IBAction)forwardButtonPress:(id)sender {
+ [webView goForward];
+}
@end
View
BIN  MappingMashupApp/addBookmarkButton@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  MappingMashupApp/addBookmarkC@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  MappingMashupApp/backArrow@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
51 MappingMashupApp/en.lproj/MainStoryboard.storyboard
@@ -83,11 +83,11 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</imageView>
<activityIndicatorView opaque="NO" contentMode="scaleToFill" animating="YES" style="whiteLarge" id="BDR-6h-3HL">
- <rect key="frame" x="144" y="320" width="37" height="37"/>
+ <rect key="frame" x="144" y="331" width="37" height="37"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</activityIndicatorView>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Experience your surroundings. Tap something interesting and we'll show you where you can get online for free." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="GWX-UP-W0P">
- <rect key="frame" x="20" y="365" width="285" height="91"/>
+ <rect key="frame" x="20" y="232" width="285" height="91"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
@@ -97,8 +97,8 @@
<rect key="frame" x="-6" y="535" width="331" height="50"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
- <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="appIcon@2x.png" id="veT-vc-0vB">
- <rect key="frame" x="62" y="94" width="200" height="200"/>
+ <imageView userInteractionEnabled="NO" contentMode="center" image="appIcon@2x.png" id="veT-vc-0vB">
+ <rect key="frame" x="103" y="113" width="119" height="131"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
</subviews>
@@ -144,7 +144,7 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="96"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Swipe to go forward or back" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="emB-3U-nsG">
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Placeholder text" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="emB-3U-nsG">
<rect key="frame" x="20" y="12" width="280" height="23"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -154,11 +154,44 @@
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="LZ0-Of-gfS">
+ <rect key="frame" x="239" y="467" width="28" height="32"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+ <state key="normal" image="backArrow@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="backButtonPress:" destination="qVE-kj-ncM" eventType="touchUpInside" id="cvL-gM-Jfe"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="xJY-2W-kR6">
+ <rect key="frame" x="280" y="467" width="29" height="32"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+ <size key="titleShadowOffset" width="1" height="0.0"/>
+ <state key="normal" image="forwardArrow@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="forwardButtonPress:" destination="qVE-kj-ncM" eventType="touchUpInside" id="9SB-rw-1hg"/>
+ </connections>
+ </button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
<navigationItem key="navigationItem" title="yelp!" id="JLn-lF-25V"/>
<connections>
+ <outlet property="backButton" destination="LZ0-Of-gfS" id="X68-Jo-Dhz"/>
+ <outlet property="forwardButton" destination="xJY-2W-kR6" id="z33-W7-FQG"/>
<outlet property="popoutView" destination="JIq-gF-FaR" id="lQi-S7-0QM"/>
<outlet property="popoutViewTextLabel" destination="emB-3U-nsG" id="8I0-rY-eUi"/>
<outlet property="webView" destination="tBs-TS-l6k" id="kQ5-DS-WTP"/>
@@ -326,7 +359,9 @@
</scene>
</scenes>
<resources>
- <image name="appIcon@2x.png" width="1024" height="1024"/>
+ <image name="appIcon@2x.png" width="114" height="114"/>
+ <image name="backArrow@2x.png" width="38" height="41"/>
+ <image name="forwardArrow@2x.png" width="38" height="41"/>
<image name="mapShadow@2x.png" width="640" height="100"/>
<image name="mapShadowTop@2x.png" width="640" height="100"/>
<image name="silverBG@2x.png" width="640" height="1136"/>
@@ -364,6 +399,10 @@
<class className="YelpWebPageBrowser" superclassName="UIViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/YelpWebPageBrowser.h"/>
<relationships>
+ <relationship kind="action" name="backButtonPress:"/>
+ <relationship kind="action" name="forwardButtonPress:"/>
+ <relationship kind="outlet" name="backButton" candidateClass="UIButton"/>
+ <relationship kind="outlet" name="forwardButton" candidateClass="UIButton"/>
<relationship kind="outlet" name="popoutView" candidateClass="UIView"/>
<relationship kind="outlet" name="popoutViewTextLabel" candidateClass="UILabel"/>
<relationship kind="outlet" name="webView" candidateClass="UIWebView"/>
View
BIN  MappingMashupApp/forwardArrow@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addBookmarkB2@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addBookmarkB2@2x.psd
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addBookmarkButton.psd
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addBookmarkButton@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addBookmarkC@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addBookmarkD@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addBookmarkProperSize.psd
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  appIcon@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  backArrow@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  backForward.psd
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  forwardArrow@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  mapShadow.psd
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Please sign in to comment.
Something went wrong with that request. Please try again.