add customContentMode for images (to support all size)

leverdeterre · Jun 3, 2015 · 30039a2 · 30039a2
1 parent 84d5a31
commit 30039a2
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 39 deletions.
diff --git a/...ription.xcworkspace/xcuserdata/jeromemorissard.xcuserdatad/UserInterfaceState.xcuserstate b/...ription.xcworkspace/xcuserdata/jeromemorissard.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Example/JMActionSheetDescription/JMCollectionItem.h b/Example/JMActionSheetDescription/JMCollectionItem.h
@@ -13,6 +13,7 @@
 @interface JMCollectionItem : NSObject <JMActionSheetCollectionItem>
 
 @property (strong, nonatomic) NSString *actionName;
-@property (strong, nonatomic) NSString *actionImageName;
+@property (strong, nonatomic) UIImage *actionImage;
+@property (assign, nonatomic) UIViewContentMode actionImageContentMode;
 
 @end
diff --git a/Example/JMActionSheetDescription/JMCollectionItem.m b/Example/JMActionSheetDescription/JMCollectionItem.m
@@ -10,17 +10,4 @@
 
 @implementation JMCollectionItem
 
-
-#pragma mark - JMActionSheetCollectionItem
-
-- (NSString *)actionNameForActionSheetCollectionItem
-{
-    return self.actionName;
-}
-
-- (NSString *)imageNamedForActionSheetCollectionItem
-{
-    return self.actionImageName;
-}
-
 @end
diff --git a/Example/JMActionSheetDescription/JMViewController.m b/Example/JMActionSheetDescription/JMViewController.m
@@ -165,32 +165,37 @@ - (IBAction)showCollection:(id)sender
     NSMutableArray *collectionItems = [NSMutableArray new];
     JMCollectionItem *item = [[JMCollectionItem alloc] init];
     item.actionName = @"facebook";
-    item.actionImageName = @"fb-icon3-150x150.png";
+    item.actionImage = [UIImage imageNamed:@"fb-icon3-150x150.png"];
     [collectionItems addObject:item];
 
     item = [[JMCollectionItem alloc] init];
     item.actionName = @"AppStore";
-    item.actionImageName = @"apple_store_app_icon.jpg";
+    item.actionImage = [UIImage imageNamed:@"apple_store_app_icon.jpg"];
+
     [collectionItems addObject:item];
 
     item = [[JMCollectionItem alloc] init];
     item.actionName = @"Password";
-    item.actionImageName = @"1Pi-icon-1024-150x150.png";
+    item.actionImage = [UIImage imageNamed:@"1Pi-icon-1024-150x150.png"];
+
     [collectionItems addObject:item];
 
     item = [[JMCollectionItem alloc] init];
     item.actionName = @"Flipboard";
-    item.actionImageName = @"Flipboard-App-Icon-150x150.jpg";
+    item.actionImage = [UIImage imageNamed:@"Flipboard-App-Icon-150x150.jpg"];
+
     [collectionItems addObject:item];
 
     item = [[JMCollectionItem alloc] init];
     item.actionName = @"Gmail";
-    item.actionImageName = @"gmail-ios-icon-app-150x150.png";
+    item.actionImage = [UIImage imageNamed:@"gmail-ios-icon-app-150x150.png"];
+
     [collectionItems addObject:item];
 
     item = [[JMCollectionItem alloc] init];
     item.actionName = @"Mail";
-    item.actionImageName = @"mail-iphone-150x150.jpg";
+    item.actionImage = [UIImage imageNamed:@"mail-iphone-150x150.jpg"];
+
     [collectionItems addObject:item];
 
     collectionItem.elements = collectionItems;
@@ -210,19 +215,26 @@ - (IBAction)showCollection:(id)sender
     JMActionSheetCollectionItem *collectionItem2 = [[JMActionSheetCollectionItem alloc] init];
     NSMutableArray *collectionItems2 = [NSMutableArray new];
     item = [[JMCollectionItem alloc] init];
-    item.actionName = @"AppStore";
-    item.actionImageName = @"apple_store_app_icon.jpg";
+    item.actionName = @"Open Plan";
+    item.actionImageContentMode = UIViewContentModeCenter;
+    UIImage *img = [IonIcons imageWithIcon:ion_map size:40.0f color:[UIColor grayColor]];
+    item.actionImage = img;    
     [collectionItems2 addObject:item];
 
     item = [[JMCollectionItem alloc] init];
-    item.actionName = @"AppStore";
-    item.actionImageName = @"apple_store_app_icon.jpg";
+    item.actionName = @"Take a beer";
+    img = [IonIcons imageWithIcon:ion_beer size:40.0f color:[UIColor grayColor]];
+    item.actionImage = img;
+    item.actionImageContentMode = UIViewContentModeCenter;
     [collectionItems2 addObject:item];
 
     item = [[JMCollectionItem alloc] init];
-    item.actionName = @"AppStore";
-    item.actionImageName = @"apple_store_app_icon.jpg";
+    item.actionName = @"ApplePay";
+    img = [IonIcons imageWithIcon:ion_card size:40.0f color:[UIColor grayColor]];
+    item.actionImage = img;
+    item.actionImageContentMode = UIViewContentModeCenter;
     [collectionItems2 addObject:item];
+
     collectionItem2.elements = collectionItems2;
     collectionItem2.collectionActionBlock = ^(JMCollectionItem *selectedValue){
         NSLog(@"collectionItem2 selectedValue %@",selectedValue.actionName);
@@ -238,32 +250,37 @@ - (IBAction)showAll:(id)sender
     NSMutableArray *collectionItems = [NSMutableArray new];
     JMCollectionItem *item = [[JMCollectionItem alloc] init];
     item.actionName = @"facebook";
-    item.actionImageName = @"fb-icon3-150x150.png";
+    item.actionImage = [UIImage imageNamed:@"fb-icon3-150x150.png"];
+
     [collectionItems addObject:item];
 
     item = [[JMCollectionItem alloc] init];
     item.actionName = @"AppStore";
-    item.actionImageName = @"apple_store_app_icon.jpg";
+    item.actionImage = [UIImage imageNamed:@"apple_store_app_icon.jpg"];
+
     [collectionItems addObject:item];
 
     item = [[JMCollectionItem alloc] init];
     item.actionName = @"Password";
-    item.actionImageName = @"1Pi-icon-1024-150x150.png";
+    item.actionImage = [UIImage imageNamed: @"1Pi-icon-1024-150x150.png"];
+
     [collectionItems addObject:item];
 
     item = [[JMCollectionItem alloc] init];
     item.actionName = @"Flipboard";
-    item.actionImageName = @"Flipboard-App-Icon-150x150.jpg";
+    item.actionImage = [UIImage imageNamed:@"Flipboard-App-Icon-150x150.jpg"];
     [collectionItems addObject:item];
 
     item = [[JMCollectionItem alloc] init];
     item.actionName = @"Gmail";
-    item.actionImageName = @"gmail-ios-icon-app-150x150.png";
+    item.actionImage = [UIImage imageNamed:@"gmail-ios-icon-app-150x150.png"];
+
     [collectionItems addObject:item];
 
     item = [[JMCollectionItem alloc] init];
     item.actionName = @"Mail";
-    item.actionImageName = @"mail-iphone-150x150.jpg";
+    item.actionImage = [UIImage imageNamed:@"mail-iphone-150x150.jpg"];
+
     [collectionItems addObject:item];
 
     collectionItem.elements = collectionItems;

diff --git a/Pod/Classes/JMActionSheetCollectionItem.h b/Pod/Classes/JMActionSheetCollectionItem.h
@@ -9,12 +9,12 @@
 #import "JMActionSheetItem.h"
 
 @protocol JMActionSheetCollectionItem <NSObject>
-@property (readonly) NSString *actionNameForActionSheetCollectionItem;
 
-@optional
-@property (readonly) UIImage *imageForActionSheetCollectionItem;
-@property (readonly) NSString *imageNamedForActionSheetCollectionItem;
+@property (strong, nonatomic) UIImage *actionImage;
+@property (strong, nonatomic) NSString *actionName;
 
+@optional
+@property (assign, nonatomic) UIViewContentMode actionImageContentMode;
 @end
 
 @interface JMActionSheetCollectionItem : JMActionSheetItem

diff --git a/Pod/Classes/JMActionSheetCollectionItemCell.m b/Pod/Classes/JMActionSheetCollectionItemCell.m
@@ -40,7 +40,7 @@ - (void)updateWithObject:(id)obj forIndexPath:(NSIndexPath *)indexPath andDelega
 
     if (nil == self.actionImageView) {
         UIImageView *imageView = [[UIImageView alloc] init];
-        imageView.contentMode = UIViewContentModeScaleAspectFill;
+        imageView.contentMode = UIViewContentModeCenter;
         CGRect frame = self.frame;
         frame.origin.y = 1.0f;
         frame.origin.x = JMActionSheetCollectionPadding;
@@ -75,8 +75,12 @@ - (void)updateWithObject:(id)obj forIndexPath:(NSIndexPath *)indexPath andDelega
     }
 
     if (conformedObject) {
-        self.actionImageView.image = [UIImage imageNamed:[conformedObject imageNamedForActionSheetCollectionItem]];
-        self.actionLabel.text = [conformedObject actionNameForActionSheetCollectionItem];
+        self.actionImageView.image = [conformedObject actionImage];
+        self.actionLabel.text = [conformedObject actionName];
+    }
+
+    if ([conformedObject respondsToSelector:@selector(actionImageContentMode)]) {
+        self.actionImageView.contentMode = [conformedObject actionImageContentMode];
     }
 
     self.indexPath = indexPath;

diff --git a/screenshots/iphones.png b/screenshots/iphones.png