Merge branch 'no_location'

gpolak · Feb 17, 2015 · 9d54cec · 9d54cec
2 parents c4a1302 + 79be1ab
commit 9d54cec
Show file tree

Hide file tree

Showing 153 changed files with 15,058 additions and 3,536 deletions.
diff --git a/GPUberView.podspec b/GPUberView.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "GPUberView"
-  s.version      = "0.5"
+  s.version      = "1.0"
   s.summary      = "Summon Uber from your app with 2 lines of code."
   s.homepage     = "https://github.com/gpolak/GPUberView"
   s.license      = { :type => "MIT", :file => "LICENSE" }
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
 
   s.platform     = :ios, "7.1"
 
-  s.source       = { :git => "https://github.com/gpolak/GPUberView.git", :tag => "0.5" }
+  s.source       = { :git => "https://github.com/gpolak/GPUberView.git", :tag => "1.0" }
 
   s.source_files = 'GPUberView'
   s.resources = 'GPUberView/*.{xib}', 'GPUberView/*.{png}'
@@ -24,6 +24,8 @@ Pod::Spec.new do |s|
   s.dependency 'SDWebImage', '~>3.6'
   s.dependency "PulsingHalo"
   s.dependency 'Masonry', '~> 0.6'
+  s.dependency 'INTULocationManager', '~> 2.0'
+  s.dependency 'BlocksKit', '~> 2.2'
 
 end
 
diff --git a/GPUberView/GPUberUtils.m b/GPUberView/GPUberUtils.m
@@ -34,10 +34,11 @@ + (UILabel *)errorLabelWithText:(NSString *)text {
     label.textColor = [UIColor whiteColor];
     label.font = [UIFont systemFontOfSize:16];
     label.text = text;
-    label.numberOfLines = 2;
+    label.numberOfLines = 0;
     label.textAlignment = NSTextAlignmentCenter;
-    label.lineBreakMode = NSLineBreakByWordWrapping;
+    label.lineBreakMode = NSLineBreakByTruncatingTail;
     label.minimumScaleFactor = 0.5;
+    [label sizeToFit];
 
     return label;
 }

diff --git a/GPUberView/GPUberViewCell.h b/GPUberView/GPUberViewCell.h
@@ -12,8 +12,8 @@
 
 @property (nonatomic, weak) IBOutlet UIImageView *productImageView;
 @property (nonatomic, weak) IBOutlet UILabel *productNameLabel;
-@property (nonatomic, weak) IBOutlet UILabel *timeEstimateLabel;
-@property (nonatomic, weak) IBOutlet UILabel *costEstimateLabel;
+@property (nonatomic, weak) IBOutlet UILabel *innerLabel;
+@property (nonatomic, weak) IBOutlet UILabel *rightLabel;
 
 + (NSString *)reuseIdentifier;
 

diff --git a/GPUberView/GPUberViewCell.m b/GPUberView/GPUberViewCell.m
@@ -11,8 +11,8 @@
 @implementation GPUberViewCell
 
 - (void)awakeFromNib {
-    self.costEstimateLabel.textColor = [UIColor grayColor];
-    self.timeEstimateLabel.textColor = [UIColor grayColor];
+    self.rightLabel.textColor = [UIColor grayColor];
+    self.innerLabel.textColor = [UIColor grayColor];
 }
 
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {

diff --git a/GPUberView/GPUberViewCell.xib b/GPUberView/GPUberViewCell.xib
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6254" systemVersion="13F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
-        <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
@@ -62,10 +61,10 @@
                 </constraints>
             </tableViewCellContentView>
             <connections>
-                <outlet property="costEstimateLabel" destination="aea-UN-Z9P" id="Kbw-yk-fuW"/>
+                <outlet property="innerLabel" destination="dQO-76-hq3" id="hJP-bx-uGi"/>
                 <outlet property="productImageView" destination="Zu1-l4-2hn" id="pJ6-MR-O2B"/>
                 <outlet property="productNameLabel" destination="Him-EH-N31" id="agf-d4-o5P"/>
-                <outlet property="timeEstimateLabel" destination="dQO-76-hq3" id="hIL-qH-ohJ"/>
+                <outlet property="rightLabel" destination="aea-UN-Z9P" id="bFP-X8-NYd"/>
             </connections>
             <point key="canvasLocation" x="176" y="327"/>
         </tableViewCell>

diff --git a/GPUberView/GPUberViewController.h b/GPUberView/GPUberViewController.h
@@ -15,9 +15,9 @@
 
 @property (nonatomic, readonly) NSString *serverToken;
 @property (nonatomic) NSString *clientId;
-@property (nonatomic, readonly) CLLocationCoordinate2D startLocation;
-@property (nonatomic, readonly) CLLocationCoordinate2D endLocation;
 
+@property (nonatomic) CLLocationCoordinate2D startLocation;
+@property (nonatomic) CLLocationCoordinate2D endLocation;
 @property (nonatomic) NSString *startName;
 @property (nonatomic) NSString *endName;
 
@@ -29,14 +29,18 @@
 @property (nonatomic) NSString *mobilePhone;
 @property (nonatomic) NSString *zipcode;
 
+- (id)initWithServerToken:(NSString *)serverToken;
+
+// deprecated in 1.0
 - (id)initWithServerToken:(NSString *)serverToken
                     start:(CLLocationCoordinate2D)start
-                      end:(CLLocationCoordinate2D)end;
+                      end:(CLLocationCoordinate2D)end __attribute__((deprecated("use initWithServerToken: instead")));
 
+// deprecated in 0.4
 - (id)initWithServerToken:(NSString *)serverToken
                  clientId:(NSString *)clientId
                     start:(CLLocationCoordinate2D)start
-                      end:(CLLocationCoordinate2D)end __attribute__((deprecated("use initWithServerToken:start:end: instead")));
+                      end:(CLLocationCoordinate2D)end __attribute__((deprecated("use initWithServerToken: instead")));
 
 - (void)showInViewController:(UIViewController *)viewController;