Removing branding

opentripplanner · Dec 27, 2012 · ad514ca · ad514ca
1 parent 9c91341
commit ad514ca
Show file tree

Hide file tree

Showing 18 changed files with 19 additions and 104 deletions.
diff --git a/OpenTripPlanner.xcodeproj/project.pbxproj b/OpenTripPlanner.xcodeproj/project.pbxproj
@@ -70,8 +70,6 @@
 		CC2316E91626067D00EE0F48 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = CC2316DD1626067D00EE0F48 /* [email protected] */; };
 		CC23170716260F9200EE0F48 /* geolocate.png in Resources */ = {isa = PBXBuildFile; fileRef = CC2316EB16260F9200EE0F48 /* geolocate.png */; };
 		CC23170816260F9200EE0F48 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = CC2316EC16260F9200EE0F48 /* [email protected] */; };
-		CC23170916260F9200EE0F48 /* joyride-logo.png in Resources */ = {isa = PBXBuildFile; fileRef = CC2316ED16260F9200EE0F48 /* joyride-logo.png */; };
-		CC23170A16260F9200EE0F48 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = CC2316EE16260F9200EE0F48 /* [email protected] */; };
 		CC23170B16260F9200EE0F48 /* magnifier.png in Resources */ = {isa = PBXBuildFile; fileRef = CC2316EF16260F9200EE0F48 /* magnifier.png */; };
 		CC23170C16260F9200EE0F48 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = CC2316F016260F9200EE0F48 /* [email protected] */; };
 		CC23170D16260F9200EE0F48 /* marker-end.png in Resources */ = {isa = PBXBuildFile; fileRef = CC2316F116260F9200EE0F48 /* marker-end.png */; };
@@ -84,8 +82,6 @@
 		CC23171E16260F9200EE0F48 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = CC23170216260F9200EE0F48 /* [email protected] */; };
 		CC23171F16260F9200EE0F48 /* mode-walk.png in Resources */ = {isa = PBXBuildFile; fileRef = CC23170316260F9200EE0F48 /* mode-walk.png */; };
 		CC23172016260F9200EE0F48 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = CC23170416260F9200EE0F48 /* [email protected] */; };
-		CC23172116260F9200EE0F48 /* path.png in Resources */ = {isa = PBXBuildFile; fileRef = CC23170516260F9200EE0F48 /* path.png */; };
-		CC23172216260F9200EE0F48 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = CC23170616260F9200EE0F48 /* [email protected] */; };
 		CC2317281627653500EE0F48 /* OTPStopBasedLegCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CC2317271627653500EE0F48 /* OTPStopBasedLegCell.m */; };
 		CC23172B16276ABD00EE0F48 /* OTPDistanceBasedLegCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CC23172A16276ABD00EE0F48 /* OTPDistanceBasedLegCell.m */; };
 		CC23176D162F17A600EE0F48 /* OTPTransferCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CC23176C162F17A500EE0F48 /* OTPTransferCell.m */; };
@@ -143,8 +139,6 @@
 		CCE01DA0165DF5F7008F873E /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CCE01D9F165DF5F6008F873E /* MessageUI.framework */; };
 		CCE81921160131FD0034E8AC /* OTPCallout.m in Sources */ = {isa = PBXBuildFile; fileRef = CCE81920160131FD0034E8AC /* OTPCallout.m */; };
 		CCF1D5DF15FE454100EEB827 /* OTPDirectionsInputViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CCF1D5DE15FE454100EEB827 /* OTPDirectionsInputViewController.m */; };
-		CCF669521630BA6E007A9634 /* home-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = CCF6693A1630BA6E007A9634 /* home-icon.png */; };
-		CCF669531630BA6E007A9634 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = CCF6693B1630BA6E007A9634 /* [email protected] */; };
 		CCF669661630BA6E007A9634 /* marker-dropped.png in Resources */ = {isa = PBXBuildFile; fileRef = CCF6694E1630BA6E007A9634 /* marker-dropped.png */; };
 		CCF669671630BA6E007A9634 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = CCF6694F1630BA6E007A9634 /* [email protected] */; };
 		CCF669681630BA6E007A9634 /* mode-bike-to-transit.png in Resources */ = {isa = PBXBuildFile; fileRef = CCF669501630BA6E007A9634 /* mode-bike-to-transit.png */; };
@@ -424,8 +418,6 @@
 		CC2316DD1626067D00EE0F48 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		CC2316EB16260F9200EE0F48 /* geolocate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = geolocate.png; sourceTree = "<group>"; };
 		CC2316EC16260F9200EE0F48 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
-		CC2316ED16260F9200EE0F48 /* joyride-logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "joyride-logo.png"; sourceTree = "<group>"; };
-		CC2316EE16260F9200EE0F48 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		CC2316EF16260F9200EE0F48 /* magnifier.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = magnifier.png; sourceTree = "<group>"; };
 		CC2316F016260F9200EE0F48 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		CC2316F116260F9200EE0F48 /* marker-end.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "marker-end.png"; sourceTree = "<group>"; };
@@ -438,8 +430,6 @@
 		CC23170216260F9200EE0F48 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		CC23170316260F9200EE0F48 /* mode-walk.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "mode-walk.png"; sourceTree = "<group>"; };
 		CC23170416260F9200EE0F48 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
-		CC23170516260F9200EE0F48 /* path.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = path.png; sourceTree = "<group>"; };
-		CC23170616260F9200EE0F48 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		CC2317261627653500EE0F48 /* OTPStopBasedLegCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTPStopBasedLegCell.h; sourceTree = "<group>"; };
 		CC2317271627653500EE0F48 /* OTPStopBasedLegCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTPStopBasedLegCell.m; sourceTree = "<group>"; };
 		CC23172916276ABD00EE0F48 /* OTPDistanceBasedLegCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTPDistanceBasedLegCell.h; sourceTree = "<group>"; };
@@ -493,7 +483,7 @@
 		CCBCD51C1635E0E300037B29 /* NSString+HMAC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+HMAC.m"; sourceTree = "<group>"; };
 		CCBCD5221635FC9900037B29 /* OTPGradientView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTPGradientView.h; sourceTree = "<group>"; };
 		CCBCD5231635FC9900037B29 /* OTPGradientView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTPGradientView.m; sourceTree = "<group>"; };
-		CCCDFB6315EEAAC600B26133 /* Joyride.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Joyride.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		CCCDFB6315EEAAC600B26133 /* OTP Mobile.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "OTP Mobile.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		CCCDFB6715EEAAC600B26133 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		CCCDFB6915EEAAC600B26133 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		CCCDFB6B15EEAAC600B26133 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -528,8 +518,6 @@
 		CCE81920160131FD0034E8AC /* OTPCallout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTPCallout.m; sourceTree = "<group>"; };
 		CCF1D5DD15FE454100EEB827 /* OTPDirectionsInputViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTPDirectionsInputViewController.h; sourceTree = "<group>"; };
 		CCF1D5DE15FE454100EEB827 /* OTPDirectionsInputViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTPDirectionsInputViewController.m; sourceTree = "<group>"; };
-		CCF6693A1630BA6E007A9634 /* home-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "home-icon.png"; sourceTree = "<group>"; };
-		CCF6693B1630BA6E007A9634 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		CCF6694E1630BA6E007A9634 /* marker-dropped.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "marker-dropped.png"; sourceTree = "<group>"; };
 		CCF6694F1630BA6E007A9634 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		CCF669501630BA6E007A9634 /* mode-bike-to-transit.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "mode-bike-to-transit.png"; sourceTree = "<group>"; };
@@ -1019,16 +1007,12 @@
 				CCF669C91631B12A007A9634 /* [email protected] */,
 				CCF669CA1631B12A007A9634 /* swap-addresses.png */,
 				CCF669CB1631B12A007A9634 /* [email protected] */,
-				CCF6693A1630BA6E007A9634 /* home-icon.png */,
-				CCF6693B1630BA6E007A9634 /* [email protected] */,
 				CCF6694E1630BA6E007A9634 /* marker-dropped.png */,
 				CCF6694F1630BA6E007A9634 /* [email protected] */,
 				CCF669501630BA6E007A9634 /* mode-bike-to-transit.png */,
 				CCF669511630BA6E007A9634 /* [email protected] */,
 				CC2316EB16260F9200EE0F48 /* geolocate.png */,
 				CC2316EC16260F9200EE0F48 /* [email protected] */,
-				CC2316ED16260F9200EE0F48 /* joyride-logo.png */,
-				CC2316EE16260F9200EE0F48 /* [email protected] */,
 				CC2316EF16260F9200EE0F48 /* magnifier.png */,
 				CC2316F016260F9200EE0F48 /* [email protected] */,
 				CC2316F116260F9200EE0F48 /* marker-end.png */,
@@ -1041,8 +1025,6 @@
 				CC23170216260F9200EE0F48 /* [email protected] */,
 				CC23170316260F9200EE0F48 /* mode-walk.png */,
 				CC23170416260F9200EE0F48 /* [email protected] */,
-				CC23170516260F9200EE0F48 /* path.png */,
-				CC23170616260F9200EE0F48 /* [email protected] */,
 			);
 			name = Icons;
 			path = icons;
@@ -1123,7 +1105,7 @@
 		CCCDFB6415EEAAC600B26133 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				CCCDFB6315EEAAC600B26133 /* Joyride.app */,
+				CCCDFB6315EEAAC600B26133 /* OTP Mobile.app */,
 				CCCDFB7E15EEAAC600B26133 /* OpenTripPlannerTests.octest */,
 			);
 			name = Products;
@@ -1221,7 +1203,7 @@
 			);
 			name = OpenTripPlanner;
 			productName = OpenTripPlanner;
-			productReference = CCCDFB6315EEAAC600B26133 /* Joyride.app */;
+			productReference = CCCDFB6315EEAAC600B26133 /* OTP Mobile.app */;
 			productType = "com.apple.product-type.application";
 		};
 		CCCDFB7D15EEAAC600B26133 /* OpenTripPlannerTests */ = {
@@ -1347,8 +1329,6 @@
 				CC2316E91626067D00EE0F48 /* [email protected] in Resources */,
 				CC23170716260F9200EE0F48 /* geolocate.png in Resources */,
 				CC23170816260F9200EE0F48 /* [email protected] in Resources */,
-				CC23170916260F9200EE0F48 /* joyride-logo.png in Resources */,
-				CC23170A16260F9200EE0F48 /* [email protected] in Resources */,
 				CC23170B16260F9200EE0F48 /* magnifier.png in Resources */,
 				CC23170C16260F9200EE0F48 /* [email protected] in Resources */,
 				CC23170D16260F9200EE0F48 /* marker-end.png in Resources */,
@@ -1361,10 +1341,6 @@
 				CC23171E16260F9200EE0F48 /* [email protected] in Resources */,
 				CC23171F16260F9200EE0F48 /* mode-walk.png in Resources */,
 				CC23172016260F9200EE0F48 /* [email protected] in Resources */,
-				CC23172116260F9200EE0F48 /* path.png in Resources */,
-				CC23172216260F9200EE0F48 /* [email protected] in Resources */,
-				CCF669521630BA6E007A9634 /* home-icon.png in Resources */,
-				CCF669531630BA6E007A9634 /* [email protected] in Resources */,
 				CCF669661630BA6E007A9634 /* marker-dropped.png in Resources */,
 				CCF669671630BA6E007A9634 /* [email protected] in Resources */,
 				CCF669681630BA6E007A9634 /* mode-bike-to-transit.png in Resources */,
@@ -1734,7 +1710,7 @@
 					"-ObjC",
 					"-all_load",
 				);
-				PRODUCT_NAME = Joyride;
+				PRODUCT_NAME = "OTP Mobile";
 				PROVISIONING_PROFILE = "70B10A69-2E7A-4667-8186-09B6FC108163";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "70B10A69-2E7A-4667-8186-09B6FC108163";
 				TARGETED_DEVICE_FAMILY = 1;
@@ -1765,7 +1741,7 @@
 					"-ObjC",
 					"-all_load",
 				);
-				PRODUCT_NAME = Joyride;
+				PRODUCT_NAME = "OTP Mobile";
 				PROVISIONING_PROFILE = "C7903C8D-6769-4A24-8CC9-5D3FE5659390";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "E773ACC5-2A35-4AC1-A104-445C24ED4438";
 				TARGETED_DEVICE_FAMILY = 1;

diff --git a/OpenTripPlanner/MainStoryboard_iPhone.storyboard b/OpenTripPlanner/MainStoryboard_iPhone.storyboard
@@ -542,7 +542,7 @@
                                 <rect key="frame" x="20" y="121" width="280" height="129"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <subviews>
-                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="This is your Joyride itinerary. Tap a row or swipe to the right to see the associated itinerary leg on a map." lineBreakMode="tailTruncation" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="fjZ-7O-hr5">
+                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="This is your OTP Mobile itinerary. Tap a row or swipe to the right to see the associated itinerary leg on a map." lineBreakMode="tailTruncation" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="fjZ-7O-hr5">
                                         <rect key="frame" x="20" y="20" width="240" height="89"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -585,30 +585,8 @@
                     <view key="view" contentMode="scaleToFill" id="Thw-Zw-Hrr">
                         <rect key="frame" x="0.0" y="20" width="320" height="460"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <subviews>
-                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" usesAttributedText="YES" id="nZc-HK-Z13">
-                                <rect key="frame" x="14" y="245" width="292" height="204"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="0.0" colorSpace="calibratedRGB"/>
-                                <attributedString key="attributedText">
-                                    <fragment>
-                                        <string key="content">JoyRide is a project of OpenPlans. This is version BETA 1.  Routing by OpenTripPlanner.  Version 1.0 built with support from a group of generous folks from Kickstarter. </string>
-                                        <attributes>
-                                            <color key="NSColor" red="0.18094004755434778" green="0.18094004755434778" blue="0.18094004755434778" alpha="1" colorSpace="calibratedRGB"/>
-                                            <font key="NSFont" size="13" name="Helvetica"/>
-                                            <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural"/>
-                                        </attributes>
-                                    </fragment>
-                                </attributedString>
-                                <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
-                                <dataDetectorType key="dataDetectorTypes" link="YES"/>
-                            </textView>
-                        </subviews>
                         <color key="backgroundColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
                     </view>
-                    <connections>
-                        <outlet property="aboutTextView" destination="nZc-HK-Z13" id="iHz-MA-Yot"/>
-                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="afM-eD-4cq" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
@@ -1161,6 +1139,9 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
         <class className="UICollectionViewFlowLayout" superclassName="UICollectionViewLayout">
             <source key="sourceIdentifier" type="project" relativePath="./Classes/UICollectionViewFlowLayout.h"/>
         </class>
+        <class className="UICollectionViewLayout" superclassName="NSObject">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/UICollectionViewLayout.h"/>
+        </class>
         <class className="ZUUIRevealController" superclassName="UIViewController">
             <source key="sourceIdentifier" type="project" relativePath="./Classes/ZUUIRevealController.h"/>
             <relationships>

diff --git a/OpenTripPlanner/OTPAboutViewController.h b/OpenTripPlanner/OTPAboutViewController.h
@@ -10,9 +10,4 @@
 
 @interface OTPAboutViewController : UIViewController
 
-@property (strong, nonatomic) IBOutlet UITextView *aboutTextView;
-
-@property (strong, nonatomic) NSURLConnection *connection;
-@property (strong, nonatomic) NSMutableData *receivedData;
-
 @end
diff --git a/OpenTripPlanner/OTPAboutViewController.m b/OpenTripPlanner/OTPAboutViewController.m
@@ -20,48 +20,15 @@ - (void)viewDidLoad
     [TestFlight passCheckpoint:@"ABOUT"];
 
     [super viewDidLoad];
-
-    NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString: @"http://www.joyrideit.com/THANKS.txt"]
-                     cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:10.0];
-
-    self.connection= [[NSURLConnection alloc] initWithRequest:request delegate:self];
-    self.receivedData = [NSMutableData data];
-
-    [self.aboutTextView.layer setShadowColor:[[UIColor lightGrayColor] CGColor]];
-    [self.aboutTextView.layer setShadowOffset:CGSizeMake(0, 1.0)];
-    [self.aboutTextView.layer setShadowOpacity:1.0];
-    [self.aboutTextView.layer setShadowRadius:0.3];
 }
 
 - (void)didReceiveMemoryWarning
 {
     [super didReceiveMemoryWarning];
-    [self.receivedData setLength: 0];
 }
 
 - (void)viewDidUnload {
-    if(self.connection != nil) {
-        [self.connection cancel];
-    }
-    [self setAboutTextView:nil];
-    [self.receivedData setLength: 0];
     [super viewDidUnload];
 }
 
-- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response {
-    [self.receivedData setLength:0];
-}
-
-- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data {
-    [self.receivedData appendData:data];
-}
-
-- (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error {
-}
-
-- (void)connectionDidFinishLoading:(NSURLConnection *)connection {
-    NSString *dataString = [[NSString alloc] initWithData: self.receivedData encoding: NSASCIIStringEncoding];
-    self.aboutTextView.text = [self.aboutTextView.text stringByAppendingString:dataString];
-}
-
 @end