Don't use imageNamed which retains memory forever, closes neilang#34.

dblock · dblock · commit 2ed98ad43b18 · 2014-05-11T20:14:59.000-04:00
diff --git a/Demo/Demo/NAAnimatedDemoViewController.m b/Demo/Demo/NAAnimatedDemoViewController.m
@@ -22,7 +22,8 @@ - (void)viewDidLoad
     mapView.backgroundColor  = [UIColor colorWithRed:0.000f green:0.475f blue:0.761f alpha:1.000f];
     mapView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
 
-    [mapView displayMap:[UIImage imageNamed:@"Maps/australia"]];
+    NSString *australia = [[[NSBundle mainBundle] bundlePath] stringByAppendingString:@"/Maps/australia.png"];
+    [mapView displayMap:[UIImage imageWithContentsOfFile:australia]];
 
     mapView.minimumZoomScale = 0.5f;
     mapView.maximumZoomScale = 1.5f;
diff --git a/Demo/Demo/NADotAnnotationDemoViewController.m b/Demo/Demo/NADotAnnotationDemoViewController.m
@@ -25,7 +25,9 @@ - (void)viewDidLoad
     mapView.minimumZoomScale = 0.5f;
     mapView.maximumZoomScale = 1.5f;
 
-    [mapView displayMap:[UIImage imageNamed:@"Maps/australia"]];
+    NSString *australia = [[[NSBundle mainBundle] bundlePath] stringByAppendingString:@"/Maps/australia.png"];
+    UIImage *image = [UIImage imageWithContentsOfFile:australia];
+    [mapView displayMap:image];
 
     [self.view addSubview:mapView];
 
diff --git a/Demo/Demo/NAInteractiveDemoViewController.m b/Demo/Demo/NAInteractiveDemoViewController.m
@@ -25,11 +25,12 @@ - (void)viewDidLoad
 
     self.annotations = [[NSMutableArray alloc] init];
 
-    UIImage *image = [UIImage imageNamed:@"Maps/australia"];
-
     self.mapView.backgroundColor = [UIColor colorWithRed:0.000f green:0.475f blue:0.761f alpha:1.000f];
     self.mapView.mapViewDelegate = self;
 
+    NSString *australia = [[[NSBundle mainBundle] bundlePath] stringByAppendingString:@"/Maps/australia.png"];
+    UIImage *image = [UIImage imageWithContentsOfFile:australia];
+
     [self.mapView displayMap:image];
 
     [self mapView:self.mapView hasChangedZoomLevel:self.mapView.zoomLevel];
diff --git a/Demo/Demo/NALoadViaNIBDemoViewController.m b/Demo/Demo/NALoadViaNIBDemoViewController.m
@@ -15,7 +15,9 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
 
-    [self.mapView displayMap:[UIImage imageNamed:@"Maps/australia"]];
+    NSString *australia = [[[NSBundle mainBundle] bundlePath] stringByAppendingString:@"/Maps/australia.png"];
+    UIImage *image = [UIImage imageWithContentsOfFile:australia];
+    [self.mapView displayMap:image];
 
     self.mapView.backgroundColor = [UIColor colorWithRed:0.000f green:0.475f blue:0.761f alpha:1.000f];
 
diff --git a/Demo/Demo/NAPinAnnotationsDemoViewController.m b/Demo/Demo/NAPinAnnotationsDemoViewController.m
@@ -25,7 +25,8 @@ - (void)viewDidLoad
     mapView.minimumZoomScale = 0.5f;
     mapView.maximumZoomScale = 1.5f;
 
-    [mapView displayMap:[UIImage imageNamed:@"Maps/australia"]];
+    NSString *australia = [[[NSBundle mainBundle] bundlePath] stringByAppendingString:@"/Maps/australia.png"];
+    [mapView displayMap:[UIImage imageWithContentsOfFile:australia]];
 
     [self.view addSubview:mapView];
 
diff --git a/Demo/Demo/NATiledImageDemoViewController.m b/Demo/Demo/NATiledImageDemoViewController.m
@@ -36,7 +36,10 @@ - (void)viewDidLoad
     mapView.backgroundColor  = [UIColor colorWithRed:0.000f green:0.475f blue:0.761f alpha:1.000f];
     mapView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
     mapView.displayTileBorders = YES;
-    // mapView.backgroundImage = [UIImage imageNamed:@"Maps/Armory2014/large.jpg"];
+
+    // NSString *background = [[[NSBundle mainBundle] bundlePath] stringByAppendingString:@"/Maps/Armory2014/large.jpg"];
+    // mapView.backgroundImage = [UIImage imageWithContentsOfFile:background];
+    
     mapView.zoomStep = 3.0f;
     _mapView = mapView;
 
diff --git a/Demo/Demo/main.m b/Demo/Demo/main.m
@@ -3,7 +3,7 @@
 //  Demo
 //
 //  Created by Neil Ang on 6/05/12.
-//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
+//  Copyright (c) 2010-14 neilang.com. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>
diff --git a/NAMapKit/NAPinAnnotationCallOutView.m b/NAMapKit/NAPinAnnotationCallOutView.m
@@ -20,10 +20,10 @@
 const CGFloat NAMapViewAnnotationCalloutRightAccessoryLeftOffset = 2.0f;
 const CGFloat NAMapViewAnnotationCalloutRightAccessoryTopOffset = 9.0f;
 const CGFloat NAMapViewAnnotationCalloutAnchorYOffset = 26.0f;
-static NSString *NAMapViewAnnotationCalloutImageLeft = @"callout_left.png";
-static NSString *NAMapViewAnnotationCalloutImageRight = @"callout_right.png";
-static NSString *NAMapViewAnnotationCalloutImageAnchor = @"callout_anchor.png";
-static NSString *NAMapViewAnnotationCalloutImageBG = @"callout_bg.png";
+static NSString *NAMapViewAnnotationCalloutImageLeft = @"/callout_left.png";
+static NSString *NAMapViewAnnotationCalloutImageRight = @"/callout_right.png";
+static NSString *NAMapViewAnnotationCalloutImageAnchor = @"/callout_anchor.png";
+static NSString *NAMapViewAnnotationCalloutImageBG = @"/callout_bg.png";
 
 @interface NAPinAnnotationCallOutView()
 
@@ -32,11 +32,11 @@ @interface NAPinAnnotationCallOutView()
 @property (nonatomic, strong) UIImageView *calloutAnchorView;
 @property (nonatomic, strong) UIImageView *calloutLeftCenterView;
 @property (nonatomic, strong) UIImageView *calloutRightCenterView;
-@property (nonatomic, strong) UILabel     *subtitleLabel;
-@property (nonatomic, strong) UILabel     *titleLabel;
-@property (nonatomic, assign) CGPoint      point;
-@property (nonatomic, assign) CGPoint      position;
-@property (nonatomic, weak)   NAMapView   *mapView;
+@property (nonatomic, strong) UILabel *subtitleLabel;
+@property (nonatomic, strong) UILabel *titleLabel;
+@property (nonatomic, assign) CGPoint point;
+@property (nonatomic, assign) CGPoint position;
+@property (nonatomic, weak)   NAMapView *mapView;
 
 - (void)positionView:(UIView *)view posX:(float)x;
 - (void)positionView:(UIView *)view posX:(float)x width:(float)width;
@@ -49,10 +49,10 @@ - (id)initOnMapView:(NAMapView *)mapView
 {
     self = [super init];
     if (self) {
-        UIImage *calloutBG                 = [[UIImage imageNamed:NAMapViewAnnotationCalloutImageBG] stretchableImageWithLeftCapWidth:0 topCapHeight:0];
-        self.calloutLeftCapView            = [[UIImageView alloc] initWithImage:[UIImage imageNamed:NAMapViewAnnotationCalloutImageLeft]];
-        self.calloutRightCapView           = [[UIImageView alloc] initWithImage:[UIImage imageNamed:NAMapViewAnnotationCalloutImageRight]];
-        self.calloutAnchorView             = [[UIImageView alloc] initWithImage:[UIImage imageNamed:NAMapViewAnnotationCalloutImageAnchor]];
+        UIImage *calloutBG                 = [[UIImage imageWithContentsOfFile:[[[NSBundle mainBundle] bundlePath] stringByAppendingString:NAMapViewAnnotationCalloutImageBG]] stretchableImageWithLeftCapWidth:0 topCapHeight:0];
+        self.calloutLeftCapView            = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:[[[NSBundle mainBundle] bundlePath] stringByAppendingString:NAMapViewAnnotationCalloutImageLeft]]];
+        self.calloutRightCapView           = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:[[[NSBundle mainBundle] bundlePath] stringByAppendingString:NAMapViewAnnotationCalloutImageRight]]];
+        self.calloutAnchorView             = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:[[[NSBundle mainBundle] bundlePath] stringByAppendingString:NAMapViewAnnotationCalloutImageAnchor]]];
         self.calloutLeftCenterView         = [[UIImageView alloc] initWithImage:calloutBG];
         self.calloutRightCenterView        = [[UIImageView alloc] initWithImage:calloutBG];
         self.subtitleLabel                 = [[UILabel alloc] initWithFrame:CGRectZero];
diff --git a/NAMapKit/NAPinAnnotationView.m b/NAMapKit/NAPinAnnotationView.m
@@ -34,22 +34,27 @@ - (void)setAnimating:(BOOL)animating
 {
     _animating = animating;
 
-    NSString *pinImage;
+    NSString *pinImageName;
     switch (self.annotation.color) {
         case NAPinColorGreen:
-            pinImage = @"pin_green";
+            pinImageName = @"pin_green";
             break;
         case NAPinColorPurple:
-            pinImage = @"pin_purple";
+            pinImageName = @"pin_purple";
             break;
         case NAPinColorRed:
-            pinImage = @"pin_red";
+            pinImageName = @"pin_red";
             break;
     }
 
-    NSString * image = _animating ? [NSString stringWithFormat:@"%@_floating", pinImage] : pinImage;
+    if (animating) {
+        pinImageName = [NSString stringWithFormat:@"%@_floating", pinImageName];
+    }
+
+    pinImageName = [NSString stringWithFormat:@"/%@.png", pinImageName];
 
-    [self setImage:[UIImage imageNamed:image] forState:UIControlStateNormal];
+    UIImage *pinImage = [UIImage imageWithContentsOfFile:[[[NSBundle mainBundle] bundlePath] stringByAppendingString:pinImageName]];
+    [self setImage:pinImage forState:UIControlStateNormal];
 }
 
 - (void)updatePosition

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,9 @@ - (void)viewDidLoad`
`15`	`15`	`{`
`16`	`16`	`[super viewDidLoad];`
`17`	`17`
`18`		`- [self.mapView displayMap:[UIImage imageNamed:@"Maps/australia"]];`
	`18`	`+ NSString *australia = [[[NSBundle mainBundle] bundlePath] stringByAppendingString:@"/Maps/australia.png"];`
	`19`	`+ UIImage *image = [UIImage imageWithContentsOfFile:australia];`
	`20`	`+ [self.mapView displayMap:image];`
`19`	`21`
`20`	`22`	`self.mapView.backgroundColor = [UIColor colorWithRed:0.000f green:0.475f blue:0.761f alpha:1.000f];`
`21`	`23`