status-im
/
react-native-camera-kit
mirror of https://github.com/status-im/react-native-camera-kit.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add minimumLineSpacing and minimumInteritemSpacing

This commit is contained in:
Ran Greenberg 2016-06-29 17:28:35 +03:00
parent 9e4af03349
commit 43c60f4f49
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
example/GalleryScreen.ios.js
View File

@ -71,7 +71,12 @@ export default class GalleryScreenNative extends Component {
this.gallery = gallery; this.gallery = gallery;
}} }}
style={{flex:1}} style={{flex:1}}
albumName={this.state.album}/> albumName={this.state.album}
minimumInteritemSpacing={10}
minimumLineSpacing={10}
/>
) )
} }
} }

2
example/package.json
View File

@ -8,7 +8,7 @@
"dependencies": { "dependencies": {
"react": "0.14.5", "react": "0.14.5",
"react-native": "0.25.1", "react-native": "0.25.1",
"react-native-camera-kit": "latest", "react-native-camera-kit": "file:../",
"seamless-immutable": "^6.1.0" "seamless-immutable": "^6.1.0"
} }
} }

17
ios/lib/ReactNativeCameraKit/CKGalleryViewManager.m
View File

@ -14,9 +14,17 @@
#define SCREEN_WIDTH ([[UIScreen mainScreen] bounds].size.width) #define SCREEN_WIDTH ([[UIScreen mainScreen] bounds].size.width)
#define SCREEN_HEIGHT ([[UIScreen mainScreen] bounds].size.height) #define SCREEN_HEIGHT ([[UIScreen mainScreen] bounds].size.height)
#define DEFAULT_MINIMUM_INTERITEM_SPACING 10.0
#define DEFAULT_MINIMUM_LINE_SPACING 10.0
@interface CKGalleryView : UIView <UICollectionViewDelegateFlowLayout, UICollectionViewDataSource> @interface CKGalleryView : UIView <UICollectionViewDelegateFlowLayout, UICollectionViewDataSource>
//props
@property (nonatomic, strong) NSString *albumName; @property (nonatomic, strong) NSString *albumName;
@property (nonatomic, strong) NSNumber *minimumLineSpacing;
@property (nonatomic, strong) NSNumber *minimumInteritemSpacing;
@property (nonatomic, strong) UICollectionView *collectionView; @property (nonatomic, strong) UICollectionView *collectionView;
@property (nonatomic, strong) PHFetchResult<PHAsset *> *galleryFetchResults; @property (nonatomic, strong) PHFetchResult<PHAsset *> *galleryFetchResults;
@property (nonatomic, strong) PHFetchResult *assetsCollection; @property (nonatomic, strong) PHFetchResult *assetsCollection;
@ -92,11 +100,11 @@ static NSString * const CellReuseIdentifier = @"Cell";
} }
- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section { - (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section {
return 0.0; return self.minimumInteritemSpacing ? self.minimumInteritemSpacing.floatValue : DEFAULT_MINIMUM_INTERITEM_SPACING;
} }
- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section { - (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section {
return 0.0; return self.minimumLineSpacing ? self.minimumLineSpacing.floatValue : DEFAULT_MINIMUM_INTERITEM_SPACING;
} }
// Layout: Set Edges // Layout: Set Edges
@ -112,7 +120,7 @@ static NSString * const CellReuseIdentifier = @"Cell";
PHFetchOptions *allPhotosOptions = [[PHFetchOptions alloc] init]; PHFetchOptions *allPhotosOptions = [[PHFetchOptions alloc] init];
allPhotosOptions.sortDescriptors = @[[NSSortDescriptor sortDescriptorWithKey:@"creationDate" ascending:YES]]; allPhotosOptions.sortDescriptors = @[[NSSortDescriptor sortDescriptorWithKey:@"creationDate" ascending:YES]];
if ([albumName isEqualToString:@"All photos"]) { if ([albumName caseInsensitiveCompare:@"all photos"] == NSOrderedSame || !albumName || [albumName isEqualToString:@""]) {
self.assetsCollection = [PHAsset fetchAssetsWithOptions:allPhotosOptions]; self.assetsCollection = [PHAsset fetchAssetsWithOptions:allPhotosOptions];
[self.collectionView reloadData]; [self.collectionView reloadData];
return; return;
@ -210,7 +218,10 @@ RCT_EXPORT_MODULE()
} }
RCT_EXPORT_VIEW_PROPERTY(albumName, NSString); RCT_EXPORT_VIEW_PROPERTY(albumName, NSString);
RCT_EXPORT_VIEW_PROPERTY(minimumLineSpacing, NSNumber);
RCT_EXPORT_VIEW_PROPERTY(minimumInteritemSpacing, NSNumber);
RCT_EXPORT_METHOD(getSelectedImages:(RCTPromiseResolveBlock)resolve RCT_EXPORT_METHOD(getSelectedImages:(RCTPromiseResolveBlock)resolve
reject:(RCTPromiseRejectBlock)reject) { reject:(RCTPromiseRejectBlock)reject) {