Merge MatrixKit develop with commit hash: b85b736313bec0592bd1cabc68035d97f5331137

Riot/Modules/MatrixKit/Views/MXKCollectionViewCell/MXKMediaCollectionViewCell.h

@@ -0,0 +1,45 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+#import "MXKCollectionViewCell.h"
+
+#import <AVKit/AVKit.h>
+
+#import "MXKImageView.h"
+
+/**
+ 'MXKMediaCollectionViewCell' class is used to display picture or video thumbnail.
+ */
+@interface MXKMediaCollectionViewCell : MXKCollectionViewCell
+
+@property (weak, nonatomic) IBOutlet UIView *customView;
+@property (weak, nonatomic) IBOutlet MXKImageView *mxkImageView;
+@property (weak, nonatomic) IBOutlet UIImageView *centerIcon;
+@property (weak, nonatomic) IBOutlet UIImageView *bottomLeftIcon;
+@property (weak, nonatomic) IBOutlet UIImageView *bottomRightIcon;
+@property (weak, nonatomic) IBOutlet UIImageView *topRightIcon;
+
+/**
+ A potential player used in the cell.
+ */
+@property (nonatomic) AVPlayerViewController *moviePlayer;
+
+/**
+ A potential observer used to update cell display.
+ */
+@property (nonatomic) id notificationObserver;
+
+@end