Merge pull request #137 from hansemannn/MOD-2171

[MOD-2171] Fix annotations crash on iOS 9
tidev · Dec 7, 2015 · f873d1b · f873d1b
2 parents 632baa2 + 7bca6eb
commit f873d1b
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 27 deletions.
diff --git a/ios/Classes/TiMapAnnotationProxy.h b/ios/Classes/TiMapAnnotationProxy.h
@@ -32,7 +32,7 @@
 - (NSString *)title;
 - (NSString *)subtitle;
 
-- (UIColor*)pinColor;
+- (id)pincolor;
 - (BOOL)animatesDrop;
 
 - (UIView*)leftViewAccessory;

diff --git a/ios/Classes/TiMapAnnotationProxy.m b/ios/Classes/TiMapAnnotationProxy.m
@@ -190,9 +190,9 @@ -(void)setSubtitle:(id)subtitle
 	}
 }
 
-- (UIColor*)pinColor
+-(id)pincolor
 {
-	return [TiUtils intValue:[self valueForUndefinedKey:@"pincolor"]];
+    return [TiUtils intValue:[self valueForUndefinedKey:@"pincolor"]];
 }
 
 -(void)setPincolor:(id)color

diff --git a/ios/Classes/TiMapModule.m b/ios/Classes/TiMapModule.m
@@ -64,20 +64,10 @@ -(TiMapCameraProxy*)createCamera:(id)args
 MAKE_SYSTEM_PROP(HYBRID_FLYOVER_TYPE, MKMapTypeHybridFlyover);
 MAKE_SYSTEM_PROP(SATELLITE_FLYOVER_TYPE, MKMapTypeSatelliteFlyover);
 #endif
-/*
- * TODO: Replace with the constants [MKPinAnnotationView redPinColor], [MKPinAnnotationView redPinColor] and [MKPinAnnotationView redPinColor]
- * as soon as we make iOS9 as the minimum SDK.
- */
 
-#ifdef __IPHONE_9_0
-MAKE_SYSTEM_PROP(ANNOTATION_RED, [MKPinAnnotationView redPinColor]);
-MAKE_SYSTEM_PROP(ANNOTATION_GREEN, [MKPinAnnotationView greenPinColor]);
-MAKE_SYSTEM_PROP(ANNOTATION_PURPLE, [MKPinAnnotationView purplePinColor]);
-#else
 MAKE_SYSTEM_PROP(ANNOTATION_RED, MKPinAnnotationColorRed);
 MAKE_SYSTEM_PROP(ANNOTATION_GREEN, MKPinAnnotationColorGreen);
 MAKE_SYSTEM_PROP(ANNOTATION_PURPLE, MKPinAnnotationColorPurple);
-#endif
 
 MAKE_SYSTEM_PROP(ANNOTATION_DRAG_STATE_NONE,MKAnnotationViewDragStateNone);
 MAKE_SYSTEM_PROP(ANNOTATION_DRAG_STATE_START,MKAnnotationViewDragStateStarting);

diff --git a/ios/Classes/TiMapView.m b/ios/Classes/TiMapView.m
@@ -968,18 +968,7 @@ - (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotation:(id <MKAnno
         else {
             MKPinAnnotationView *pinview = (MKPinAnnotationView*)annView;
 
-            if([self isIOS9OrGreater] == YES) {
-#if __IPHONE_9_0
-                pinview.pinTintColor = [ann pinColor];
-#endif
-            } else {
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-                pinview.pinColor = [ann pinColor];
-#pragma GCC diagnostic pop
-            }
-
+            pinview.pinColor = [ann pincolor];
             pinview.animatesDrop = [ann animatesDrop] && ![(TiMapAnnotationProxy *)annotation placed];
             annView.calloutOffset = CGPointMake(-8, 0);
         }

diff --git a/ios/manifest b/ios/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 2.5.0
+version: 2.5.1
 apiversion: 2
 architectures: armv7 arm64 i386 x86_64
 description: External version of Map module

diff --git a/ios/titanium.xcconfig b/ios/titanium.xcconfig
@@ -4,7 +4,7 @@
 // OF YOUR TITANIUM SDK YOU'RE BUILDING FOR
 //
 //
-TITANIUM_SDK_VERSION = 5.0.2.GA
+TITANIUM_SDK_VERSION = 5.1.0.GA
 
 
 //
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ @@
     // OF YOUR TITANIUM SDK YOU'RE BUILDING FOR
     //
     //
-    TITANIUM_SDK_VERSION = 5.0.2.GA
+    TITANIUM_SDK_VERSION = 5.1.0.GA
     //
@@ Expand Down @@