Small fixes

angelolloqui · Sep 10, 2012 · 1a68ad5 · 1a68ad5
1 parent 9693e0a
commit 1a68ad5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/src/AGImageDetailViewController.h b/src/AGImageDetailViewController.h
@@ -14,6 +14,7 @@
 @property (readonly, strong) UIImageView *targetImageView;
 @property (readonly, strong) UILabel *imageViewSizeLabel;
 @property (readonly, strong) UILabel *imageSizeLabel;
+@property (readonly, strong) UILabel *imageRetinaLabel;
 @property (readonly, strong) UILabel *contentModeLabel;
 @property (readonly, strong) UILabel *issuesLabel;
 @property (readonly, strong) UILabel *imageNameLabel;

diff --git a/src/AGImageDetailViewController.m b/src/AGImageDetailViewController.m
@@ -18,6 +18,7 @@ @interface AGImageDetailViewController ()
 @property (readwrite, strong) UIImageView *targetImageView;
 @property (readwrite, strong) UILabel *imageViewSizeLabel;
 @property (readwrite, strong) UILabel *imageSizeLabel;
+@property (readwrite, strong) UILabel *imageRetinaLabel;
 @property (readwrite, strong) UILabel *contentModeLabel;
 @property (readwrite, strong) UILabel *issuesLabel;
 @property (readwrite, strong) UILabel *imageNameLabel;
@@ -33,6 +34,7 @@ @implementation AGImageDetailViewController
 @synthesize targetImageView;
 @synthesize imageViewSizeLabel;
 @synthesize imageSizeLabel;
+@synthesize imageRetinaLabel;
 @synthesize contentModeLabel;
 @synthesize issuesLabel;
 @synthesize imageNameLabel;
@@ -70,6 +72,7 @@ - (void)viewDidLoad
     self.posY = padding;
     self.imageViewSizeLabel = [self addLabelWithTitle:@"View size:" andText:NSStringFromCGSize(targetImageView.frame.size)];
     self.imageSizeLabel = [self addLabelWithTitle:@"Image size:" andText:NSStringFromCGSize(targetImageView.image.size)];
+    self.imageRetinaLabel = [self addLabelWithTitle:@"Using retina:" andText:(targetImageView.image.scale > 1)? @"YES" : @"NO"];
     self.contentModeLabel = [self addLabelWithTitle:@"Content Mode:" andText:[self contentModeToString:targetImageView.contentMode]];
     self.issuesLabel = [self addLabelWithTitle:@"Issues:" andText:[[self descriptionsForIssues:targetImageView.issues] componentsJoinedByString:@",\n"]];
     self.imageNameLabel = [self addLabelWithTitle:@"Image name:" andText:targetImageView.accessibilityLabel];
@@ -78,7 +81,10 @@ - (void)viewDidLoad
     [self addLabelWithTitle:@"Original" andText:@""];
     self.orginalImageView = [[UIImageView alloc] initWithFrame:CGRectMake(padding, posY, targetImageView.image.size.width, targetImageView.image.size.height)];
     self.orginalImageView.image = targetImageView.image;
-    self.orginalImageView.issues = AGImageCheckerIssueNone;
+    self.orginalImageView.issues = AGImageCheckerIssueNone;    
+    UIView *backView = [[UIView alloc] initWithFrame:self.orginalImageView.frame];
+    backView.backgroundColor = [UIColor colorWithPatternImage:[UIImage imageNamed:@"AGTileBackground"]];
+    [self.contentScrollView addSubview:backView];
     [self.contentScrollView addSubview:orginalImageView];
     posY += orginalImageView.frame.size.height + (int)(padding / 2);
 
@@ -88,6 +94,9 @@ - (void)viewDidLoad
     self.renderedImageView.contentMode = targetImageView.contentMode;
     self.renderedImageView.clipsToBounds = YES;
     self.renderedImageView.issues = AGImageCheckerIssueNone;    
+    backView = [[UIView alloc] initWithFrame:self.renderedImageView.frame];
+    backView.backgroundColor = [UIColor colorWithPatternImage:[UIImage imageNamed:@"AGTileBackground"]];
+    [self.contentScrollView addSubview:backView];
     [self.contentScrollView addSubview:renderedImageView];
     posY += renderedImageView.frame.size.height + (int)(padding / 2);
 

diff --git a/src/AGTileBackground.png b/src/AGTileBackground.png
diff --git a/src/UIImageView+AGImageChecker.m b/src/UIImageView+AGImageChecker.m
@@ -9,7 +9,8 @@
 #import "UIImageView+AGImageChecker.h"
 #import <objc/runtime.h>
 
-#define CGSizeIsBiggerThan(size1, size2) ((size1.width > size2.width) && (size1.height > size2.height))
+#define CGSizeIsBiggerThan(size1, size2) ((size1.width > size2.width) || (size1.height > size2.height))
+#define CGSizeIsStrictlyBiggerThan(size1, size2) ((size1.width > size2.width) && (size1.height > size2.height))
 #define CGSizeIsProportionalTo(size1, size2) ((size1.width / size2.width) == (size1.height / size2.height))
 
 @implementation UIImageView (AGImageChecker)
@@ -105,7 +106,7 @@ - (void)checkImage {
         viewSize = CGSizeMake(viewSize.width * viewScale, viewSize.height * viewScale);
 
         if (self.contentMode == UIViewContentModeScaleAspectFill) {        
-            if ((imgSize.width != viewSize.width) && (imgSize.height != viewSize.height)) {
+            if ((imgSize.width != viewSize.width) || (imgSize.height != viewSize.height)) {
                 issues |= AGImageCheckerIssueResized;
             }
             if (CGSizeIsBiggerThan(viewSize, imgSize)) {
@@ -116,11 +117,11 @@ - (void)checkImage {
             }
         }
         else if (self.contentMode == UIViewContentModeScaleAspectFit) {
-            if (CGSizeIsBiggerThan(viewSize, imgSize)) {
+            if (CGSizeIsStrictlyBiggerThan(viewSize, imgSize)) {
                 issues |= AGImageCheckerIssueResized;
                 issues |= AGImageCheckerIssueBlurry;
             }        
-            else if (CGSizeIsBiggerThan(imgSize, viewSize)) {
+            else if (CGSizeIsStrictlyBiggerThan(imgSize, viewSize)) {
                 issues |= AGImageCheckerIssueResized;
             }        
         }