Resurrected 128-pixel icon for About page

[zxing.git] / iphone / Classes / ParsedResult.m

diff --git a/iphone/Classes/ParsedResult.m b/iphone/Classes/ParsedResult.m
index 9dee7fd..4d4494d 100644 (file)
--- a/iphone/Classes/ParsedResult.m
+++ b/iphone/Classes/ParsedResult.m
@@ -23,11 +23,9 @@
 
 #import "TextParsedResult.h"
 #import "TelParsedResult.h"
-#import "EmailDoCoMoParsedResult.h"
-#import "AddressBookDoCoMoParsedResult.h"
+#import "EmailParsedResult.h"
+#import "BusinessCardParsedResult.h"
 #import "URIParsedResult.h"
-#import "URLTOParsedResult.h"
-#import "BookmarkDoCoMoParsedResult.h"
 #import "GeoParsedResult.h"
 
 #import "UIKit/UIStringDrawing.h"
@@ -35,37 +33,8 @@
 
 @implementation ParsedResult
 
-static NSArray *parsedResultTypes = nil;
 static NSMutableDictionary *iconsByClass = nil;
 
-+ (NSArray *)parsedResultTypes {
-  if (parsedResultTypes == nil) {
-    parsedResultTypes = 
-    [[NSArray alloc] initWithObjects:
-     [AddressBookDoCoMoParsedResult class],
-     [EmailDoCoMoParsedResult class],
-     [BookmarkDoCoMoParsedResult class],
-     [URLTOParsedResult class],
-     [TelParsedResult class],
-     [GeoParsedResult class],
-     [URIParsedResult class],
-     [TextParsedResult class], 
-     nil];
-  }
-  return parsedResultTypes;
-}
-
-+ parsedResultForString:(NSString *)s {
-  NSLog(@"parsing result:\n<<<\n%@\n>>>\n", s);
-  for (Class c in [self parsedResultTypes]) {
-    ParsedResult *result = [c parsedResultForString:s];
-    if (result != nil) {
-      return result;
-    }
-  }
-  return nil;
-}
-
 + (NSString *)typeName {
   return NSStringFromClass(self);
 }
@@ -74,26 +43,29 @@ static NSMutableDictionary *iconsByClass = nil;
   return @"{none}";
 }
 
+#define ICON_SIZE 40
+#define ICON_INSIDE 36
+
 + (UIImage *)icon {
   if (iconsByClass == nil) {
     iconsByClass = [[NSMutableDictionary alloc] initWithCapacity:16];
   }
   UIImage *icon = [iconsByClass objectForKey:[self class]];
   if (icon == nil) {
-    UIGraphicsBeginImageContext(CGSizeMake(60, 60));
+    UIGraphicsBeginImageContext(CGSizeMake(ICON_SIZE, ICON_SIZE));
     CGContextRef ctx = UIGraphicsGetCurrentContext();
     
     [[UIColor lightGrayColor] set];
-    UIRectFill(CGRectMake(0, 0, 60, 60));
+    UIRectFill(CGRectMake(0, 0, ICON_SIZE, ICON_SIZE));
     
     [[UIColor blackColor] set];
     NSString *s = [[self class] typeName];
     UIFont *font = [UIFont systemFontOfSize:16];
     CGSize stringSize = [s sizeWithFont:font];
-    float xScale = fminf(1.0, 54.0 / stringSize.width);
-    float yScale = fminf(1.0, 54.0 / stringSize.height);
+    float xScale = fminf(1.0, ICON_INSIDE / stringSize.width);
+    float yScale = fminf(1.0, ICON_INSIDE / stringSize.height);
     
-    CGContextTranslateCTM(ctx, 30, 30);
+    CGContextTranslateCTM(ctx, (ICON_SIZE / 2), (ICON_SIZE / 2));
     CGContextRotateCTM(ctx, -M_PI / 6.0);
     CGContextScaleCTM(ctx, xScale, yScale);
     CGContextTranslateCTM(ctx,