mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-28 23:32:41 +00:00
Finalize media picker by handling full library picker
This commit is contained in:
giomfo
parent
d4d5915a52
commit
e9a8fdc429
4 changed files with 262 additions and 24 deletions
|
|
@ -43,7 +43,7 @@
|
|||
|
||||
/**
|
||||
*/
|
||||
@interface MediaPickerViewController : MXKViewController <UICollectionViewDataSource, UICollectionViewDelegate, UICollectionViewDelegateFlowLayout, AVCaptureFileOutputRecordingDelegate>
|
||||
@interface MediaPickerViewController : MXKViewController <UICollectionViewDataSource, UICollectionViewDelegate, UICollectionViewDelegateFlowLayout, AVCaptureFileOutputRecordingDelegate, UIImagePickerControllerDelegate, UINavigationControllerDelegate>
|
||||
|
||||
/**
|
||||
* Returns the `UINib` object initialized for a `MediaPickerViewController`.
|
||||
|
|
|
|||
|
|
@ -22,6 +22,10 @@
|
|||
|
||||
#import <MediaPlayer/MediaPlayer.h>
|
||||
|
||||
//#define MEDIA_PICKER_VC_LARGE_IMAGE_SIZE 1024
|
||||
//#define MEDIA_PICKER_VC_MEDIUM_IMAGE_SIZE 768
|
||||
//#define MEDIA_PICKER_VC_SMALL_IMAGE_SIZE 512
|
||||
|
||||
static void *CapturingStillImageContext = &CapturingStillImageContext;
|
||||
static void *RecordingContext = &RecordingContext;
|
||||
|
||||
|
|
@ -54,6 +58,9 @@ NSString* const recentItemCollectionViewCellId = @"recentItemCollectionViewCellI
|
|||
PHFetchResult *assetsFetchResult;
|
||||
|
||||
NSMutableArray *selectedAssets;
|
||||
|
||||
UIImagePickerController *fullLibraryPicker;
|
||||
MXKImageView* imageValidationView;
|
||||
}
|
||||
|
||||
@property (nonatomic) AVCaptureVideoOrientation previewOrientation;
|
||||
|
|
@ -334,6 +341,9 @@ NSString* const recentItemCollectionViewCellId = @"recentItemCollectionViewCellI
|
|||
{
|
||||
[self stopAVCapture];
|
||||
|
||||
[self dismissImageValidationView];
|
||||
[self dismissMediaPicker];
|
||||
|
||||
cameraQueue = nil;
|
||||
|
||||
[super destroy];
|
||||
|
|
@ -392,10 +402,7 @@ NSString* const recentItemCollectionViewCellId = @"recentItemCollectionViewCellI
|
|||
{
|
||||
[MXKMediaManager saveMediaToPhotosLibrary:outputVideoFileURL isImage:NO success:^{
|
||||
|
||||
if (self.delegate)
|
||||
{
|
||||
[self.delegate mediaPickerController:self didSelectVideo:outputVideoFileURL];
|
||||
}
|
||||
[self.delegate mediaPickerController:self didSelectVideo:outputVideoFileURL];
|
||||
|
||||
[self.cameraActivityIndicator stopAnimating];
|
||||
outputVideoFileURL = nil;
|
||||
|
|
@ -424,10 +431,7 @@ NSString* const recentItemCollectionViewCellId = @"recentItemCollectionViewCellI
|
|||
{
|
||||
[MXKMediaManager saveImageToPhotosLibrary:self.cameraCaptureImageView.image success:^{
|
||||
|
||||
if (self.delegate)
|
||||
{
|
||||
[self.delegate mediaPickerController:self didSelectImage:self.cameraCaptureImageView.image];
|
||||
}
|
||||
[self.delegate mediaPickerController:self didSelectImage:self.cameraCaptureImageView.image];
|
||||
|
||||
[self.cameraActivityIndicator stopAnimating];
|
||||
|
||||
|
|
@ -458,7 +462,17 @@ NSString* const recentItemCollectionViewCellId = @"recentItemCollectionViewCellI
|
|||
[self.cameraActivityIndicator stopAnimating];
|
||||
}
|
||||
}
|
||||
else if (sender == self.libraryChooseButton && selectedAssets && self.delegate)
|
||||
else if (sender == self.libraryOpenButton)
|
||||
{
|
||||
// Open media gallery
|
||||
fullLibraryPicker = [[UIImagePickerController alloc] init];
|
||||
fullLibraryPicker.delegate = self;
|
||||
fullLibraryPicker.sourceType = UIImagePickerControllerSourceTypePhotoLibrary;
|
||||
fullLibraryPicker.allowsEditing = NO;
|
||||
fullLibraryPicker.mediaTypes = self.mediaTypes;
|
||||
[self presentViewController:fullLibraryPicker animated:YES completion:nil];
|
||||
}
|
||||
else if (sender == self.libraryChooseButton && selectedAssets)
|
||||
{
|
||||
self.libraryChooseButton.enabled = NO;
|
||||
|
||||
|
|
@ -1192,4 +1206,232 @@ NSString* const recentItemCollectionViewCellId = @"recentItemCollectionViewCellI
|
|||
return CGSizeZero;
|
||||
}
|
||||
|
||||
#pragma mark - UIImagePickerControllerDelegate
|
||||
|
||||
- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info
|
||||
{
|
||||
[self dismissMediaPicker];
|
||||
|
||||
NSString *mediaType = [info objectForKey:UIImagePickerControllerMediaType];
|
||||
if ([mediaType isEqualToString:(NSString *)kUTTypeImage])
|
||||
{
|
||||
UIImage *selectedImage = [info objectForKey:UIImagePickerControllerOriginalImage];
|
||||
if (selectedImage)
|
||||
{
|
||||
// media picker does not offer a preview
|
||||
// so add a preview to let the user validates his selection
|
||||
__weak typeof(self) weakSelf = self;
|
||||
|
||||
imageValidationView = [[MXKImageView alloc] initWithFrame:CGRectZero];
|
||||
imageValidationView.stretchable = YES;
|
||||
|
||||
// the user validates the image
|
||||
[imageValidationView setRightButtonTitle:[NSBundle mxk_localizedStringForKey:@"ok"] handler:^(MXKImageView* imageView, NSString* buttonTitle) {
|
||||
__strong __typeof(weakSelf)strongSelf = weakSelf;
|
||||
|
||||
// Dismiss the image view
|
||||
[strongSelf dismissImageValidationView];
|
||||
|
||||
NSURL *imageURL = [info valueForKey:UIImagePickerControllerReferenceURL];
|
||||
NSData *selectedImageFileData = [NSData dataWithContentsOfURL:imageURL];
|
||||
|
||||
// Prompt user about image compression
|
||||
[strongSelf promptCompressionForSelectedImage:selectedImage withFileData:selectedImageFileData];
|
||||
}];
|
||||
|
||||
// the user wants to use an other image
|
||||
[imageValidationView setLeftButtonTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] handler:^(MXKImageView* imageView, NSString* buttonTitle) {
|
||||
__strong __typeof(weakSelf)strongSelf = weakSelf;
|
||||
|
||||
// dismiss the image view
|
||||
[strongSelf dismissImageValidationView];
|
||||
|
||||
// Open again media gallery
|
||||
strongSelf->fullLibraryPicker = [[UIImagePickerController alloc] init];
|
||||
strongSelf->fullLibraryPicker.delegate = strongSelf;
|
||||
strongSelf->fullLibraryPicker.sourceType = UIImagePickerControllerSourceTypePhotoLibrary;
|
||||
strongSelf->fullLibraryPicker.allowsEditing = NO;
|
||||
strongSelf->fullLibraryPicker.mediaTypes = picker.mediaTypes;
|
||||
|
||||
[strongSelf presentViewController:strongSelf->fullLibraryPicker animated:YES completion:nil];
|
||||
}];
|
||||
|
||||
imageValidationView.image = selectedImage;
|
||||
[imageValidationView showFullScreen];
|
||||
}
|
||||
}
|
||||
else if ([mediaType isEqualToString:(NSString *)kUTTypeMovie])
|
||||
{
|
||||
NSURL* selectedVideo = [info objectForKey:UIImagePickerControllerMediaURL];
|
||||
[self.delegate mediaPickerController:self didSelectVideo:selectedVideo];
|
||||
|
||||
// Dismiss the picker
|
||||
[self onButtonPressed:self.navigationItem.leftBarButtonItem];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker
|
||||
{
|
||||
[self dismissMediaPicker];
|
||||
}
|
||||
|
||||
- (void)promptCompressionForSelectedImage:(UIImage*)selectedImage withFileData:(NSData*)selectedImageFileData
|
||||
{
|
||||
// TODO
|
||||
|
||||
// Send the original image
|
||||
[self.delegate mediaPickerController:self didSelectImage:selectedImage];
|
||||
// Dismiss the picker
|
||||
[self onButtonPressed:self.navigationItem.leftBarButtonItem];
|
||||
return;
|
||||
|
||||
/*
|
||||
if (alert)
|
||||
{
|
||||
[alert dismiss:NO];
|
||||
alert = nil;
|
||||
}
|
||||
|
||||
CGSize originalSize = selectedImage.size;
|
||||
NSLog(@"Selected image size : %f %f", originalSize.width, originalSize.height);
|
||||
|
||||
long long smallFilesize = 0;
|
||||
long long mediumFilesize = 0;
|
||||
long long largeFilesize = 0;
|
||||
|
||||
long long originalFileSize = selectedImageFileData.length;
|
||||
NSLog(@"- use the photo library file size: %tu", originalFileSize);
|
||||
|
||||
CGFloat maxSize = MAX(originalSize.width, originalSize.height);
|
||||
if (maxSize >= MEDIA_PICKER_VC_SMALL_IMAGE_SIZE)
|
||||
{
|
||||
CGFloat factor = MEDIA_PICKER_VC_SMALL_IMAGE_SIZE / maxSize;
|
||||
smallFilesize = factor * factor * originalFileSize;
|
||||
}
|
||||
else
|
||||
{
|
||||
NSLog(@"- too small to fit in %d", MEDIA_PICKER_VC_SMALL_IMAGE_SIZE);
|
||||
}
|
||||
|
||||
if (maxSize >= MEDIA_PICKER_VC_MEDIUM_IMAGE_SIZE)
|
||||
{
|
||||
CGFloat factor = MEDIA_PICKER_VC_MEDIUM_IMAGE_SIZE / maxSize;
|
||||
mediumFilesize = factor * factor * originalFileSize;
|
||||
}
|
||||
else
|
||||
{
|
||||
NSLog(@"- too small to fit in %d", MEDIA_PICKER_VC_MEDIUM_IMAGE_SIZE);
|
||||
}
|
||||
|
||||
if (maxSize >= MEDIA_PICKER_VC_LARGE_IMAGE_SIZE)
|
||||
{
|
||||
CGFloat factor = MEDIA_PICKER_VC_LARGE_IMAGE_SIZE / maxSize;
|
||||
largeFilesize = factor * factor * originalFileSize;
|
||||
}
|
||||
else
|
||||
{
|
||||
NSLog(@"- too small to fit in %d", MEDIA_PICKER_VC_LARGE_IMAGE_SIZE);
|
||||
}
|
||||
|
||||
if (smallFilesize || mediumFilesize || largeFilesize)
|
||||
{
|
||||
alert = [[MXKAlert alloc] initWithTitle:[NSBundle mxk_localizedStringForKey:@"attachment_size_prompt"] message:nil style:MXKAlertStyleActionSheet];
|
||||
__weak typeof(self) weakSelf = self;
|
||||
|
||||
if (smallFilesize)
|
||||
{
|
||||
NSString *title = [NSString stringWithFormat:[NSBundle mxk_localizedStringForKey:@"attachment_small"], [MXKTools fileSizeToString: (int)smallFilesize]];
|
||||
[alert addActionWithTitle:title style:MXKAlertActionStyleDefault handler:^(MXKAlert *alert) {
|
||||
__strong __typeof(weakSelf)strongSelf = weakSelf;
|
||||
strongSelf->alert = nil;
|
||||
|
||||
// Send the small image
|
||||
UIImage *smallImage = [MXKTools resize:selectedImage toFitInSize:CGSizeMake(MEDIA_PICKER_VC_SMALL_IMAGE_SIZE, MEDIA_PICKER_VC_SMALL_IMAGE_SIZE)];
|
||||
[strongSelf.delegate mediaPickerController:strongSelf didSelectImage:smallImage];
|
||||
// Dismiss the picker
|
||||
[self onButtonPressed:self.navigationItem.leftBarButtonItem];
|
||||
}];
|
||||
}
|
||||
|
||||
if (mediumFilesize)
|
||||
{
|
||||
NSString *title = [NSString stringWithFormat:[NSBundle mxk_localizedStringForKey:@"attachment_medium"], [MXKTools fileSizeToString: (int)mediumFilesize]];
|
||||
[alert addActionWithTitle:title style:MXKAlertActionStyleDefault handler:^(MXKAlert *alert) {
|
||||
__strong __typeof(weakSelf)strongSelf = weakSelf;
|
||||
strongSelf->alert = nil;
|
||||
|
||||
// Send the medium image
|
||||
UIImage *mediumImage = [MXKTools resize:selectedImage toFitInSize:CGSizeMake(MEDIA_PICKER_VC_MEDIUM_IMAGE_SIZE, MEDIA_PICKER_VC_MEDIUM_IMAGE_SIZE)];
|
||||
[strongSelf.delegate mediaPickerController:strongSelf didSelectImage:mediumImage];
|
||||
// Dismiss the picker
|
||||
[self onButtonPressed:self.navigationItem.leftBarButtonItem];
|
||||
}];
|
||||
}
|
||||
|
||||
if (largeFilesize)
|
||||
{
|
||||
NSString *title = [NSString stringWithFormat:[NSBundle mxk_localizedStringForKey:@"attachment_large"], [MXKTools fileSizeToString: (int)largeFilesize]];
|
||||
[alert addActionWithTitle:title style:MXKAlertActionStyleDefault handler:^(MXKAlert *alert) {
|
||||
__strong __typeof(weakSelf)strongSelf = weakSelf;
|
||||
strongSelf->alert = nil;
|
||||
|
||||
// Send the large image
|
||||
UIImage *largeImage = [MXKTools resize:selectedImage toFitInSize:CGSizeMake(MEDIA_PICKER_VC_LARGE_IMAGE_SIZE, MEDIA_PICKER_VC_LARGE_IMAGE_SIZE)];
|
||||
[strongSelf.delegate mediaPickerController:strongSelf didSelectImage:largeImage];
|
||||
// Dismiss the picker
|
||||
[self onButtonPressed:self.navigationItem.leftBarButtonItem];
|
||||
}];
|
||||
}
|
||||
|
||||
NSString *title = [NSString stringWithFormat:[NSBundle mxk_localizedStringForKey:@"attachment_original"], [MXKTools fileSizeToString: (int)originalFileSize]];
|
||||
[alert addActionWithTitle:title style:MXKAlertActionStyleDefault handler:^(MXKAlert *alert) {
|
||||
__strong __typeof(weakSelf)strongSelf = weakSelf;
|
||||
strongSelf->alert = nil;
|
||||
|
||||
// Send the original image
|
||||
[strongSelf.delegate mediaPickerController:strongSelf didSelectImage:selectedImage];
|
||||
// Dismiss the picker
|
||||
[self onButtonPressed:self.navigationItem.leftBarButtonItem];
|
||||
}];
|
||||
|
||||
alert.cancelButtonIndex = [alert addActionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] style:MXKAlertActionStyleDefault handler:^(MXKAlert *alert) {
|
||||
__strong __typeof(weakSelf)strongSelf = weakSelf;
|
||||
strongSelf->alert = nil;
|
||||
}];
|
||||
|
||||
alert.sourceView = self.view;
|
||||
|
||||
[alert showInViewController:self];
|
||||
}
|
||||
else
|
||||
{
|
||||
// Send the original image
|
||||
[self.delegate mediaPickerController:self didSelectImage:selectedImage];
|
||||
// Dismiss the picker
|
||||
[self onButtonPressed:self.navigationItem.leftBarButtonItem];
|
||||
}*/
|
||||
}
|
||||
|
||||
- (void)dismissMediaPicker
|
||||
{
|
||||
if (fullLibraryPicker)
|
||||
{
|
||||
fullLibraryPicker.delegate = nil;
|
||||
|
||||
[self dismissViewControllerAnimated:YES completion:^{
|
||||
fullLibraryPicker = nil;
|
||||
}];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)dismissImageValidationView
|
||||
{
|
||||
if (imageValidationView)
|
||||
{
|
||||
[imageValidationView dismissSelection];
|
||||
[imageValidationView removeFromSuperview];
|
||||
imageValidationView = nil;
|
||||
}
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -135,20 +135,18 @@
|
|||
</button>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="uSU-qr-XnK" firstAttribute="centerX" secondItem="uRG-b0-CjY" secondAttribute="centerX" multiplier="0.5" id="Bum-4v-TdL"/>
|
||||
<constraint firstItem="uts-4w-rUd" firstAttribute="top" secondItem="cE0-0g-Su5" secondAttribute="top" constant="8" id="Dua-l7-fL2"/>
|
||||
<constraint firstItem="w7z-f3-kdT" firstAttribute="height" secondItem="oF6-b2-322" secondAttribute="height" id="EKr-38-VDJ"/>
|
||||
<constraint firstAttribute="centerX" secondItem="w7z-f3-kdT" secondAttribute="centerX" id="F0v-GZ-U3n"/>
|
||||
<constraint firstItem="w7z-f3-kdT" firstAttribute="top" secondItem="uts-4w-rUd" secondAttribute="bottom" constant="8" id="FX3-E3-rR4"/>
|
||||
<constraint firstItem="w7z-f3-kdT" firstAttribute="trailing" secondItem="PXk-ZD-TYS" secondAttribute="trailing" id="NBc-2m-4yz"/>
|
||||
<constraint firstItem="uRG-b0-CjY" firstAttribute="centerY" secondItem="uSU-qr-XnK" secondAttribute="centerY" constant="-0.5" id="RqV-3a-gMc"/>
|
||||
<constraint firstItem="uRG-b0-CjY" firstAttribute="centerY" secondItem="uSU-qr-XnK" secondAttribute="centerY" id="RqV-3a-gMc"/>
|
||||
<constraint firstItem="w7z-f3-kdT" firstAttribute="centerY" secondItem="dxP-iB-dWk" secondAttribute="centerY" constant="-3" id="VJR-vg-mUx"/>
|
||||
<constraint firstItem="PkX-yh-JhO" firstAttribute="centerX" secondItem="uRG-b0-CjY" secondAttribute="centerX" multiplier="3/2" id="X65-AQ-3jq"/>
|
||||
<constraint firstItem="w7z-f3-kdT" firstAttribute="top" secondItem="PXk-ZD-TYS" secondAttribute="top" id="Yc4-hC-fc3"/>
|
||||
<constraint firstItem="uRG-b0-CjY" firstAttribute="top" secondItem="w7z-f3-kdT" secondAttribute="bottom" constant="5" id="ZcV-Ea-NN1"/>
|
||||
<constraint firstItem="sO8-Ds-mXZ" firstAttribute="leading" secondItem="w7z-f3-kdT" secondAttribute="leading" id="ZdZ-67-BUd"/>
|
||||
<constraint firstItem="w7z-f3-kdT" firstAttribute="width" secondItem="oF6-b2-322" secondAttribute="width" id="Zem-wK-IXz"/>
|
||||
<constraint firstItem="PkX-yh-JhO" firstAttribute="centerY" secondItem="uRG-b0-CjY" secondAttribute="centerY" constant="0.5" id="cAA-A1-uXM"/>
|
||||
<constraint firstItem="PkX-yh-JhO" firstAttribute="centerY" secondItem="uRG-b0-CjY" secondAttribute="centerY" id="cAA-A1-uXM"/>
|
||||
<constraint firstItem="w7z-f3-kdT" firstAttribute="centerX" secondItem="dxP-iB-dWk" secondAttribute="centerX" id="dhO-04-amL"/>
|
||||
<constraint firstItem="sO8-Ds-mXZ" firstAttribute="top" secondItem="w7z-f3-kdT" secondAttribute="top" id="lOa-v3-8Nb"/>
|
||||
<constraint firstItem="w7z-f3-kdT" firstAttribute="centerY" secondItem="oF6-b2-322" secondAttribute="centerY" id="nH2-Ay-Kdw"/>
|
||||
|
|
@ -161,7 +159,7 @@
|
|||
</constraints>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QeN-lu-6hK" userLabel="Library View">
|
||||
<rect key="frame" x="0.0" y="401" width="600" height="225"/>
|
||||
<rect key="frame" x="0.0" y="401" width="600" height="228"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="peT-9h-pw6" userLabel="Select Picture Label">
|
||||
<rect key="frame" x="8" y="15" width="584" height="21"/>
|
||||
|
|
@ -190,7 +188,7 @@
|
|||
</connections>
|
||||
</collectionView>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Iem-Jz-DfR" userLabel="Library Button">
|
||||
<rect key="frame" x="124" y="183" width="50" height="32"/>
|
||||
<rect key="frame" x="125" y="186" width="50" height="32"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="16"/>
|
||||
<state key="normal" title="Library">
|
||||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||
|
|
@ -201,7 +199,7 @@
|
|||
</connections>
|
||||
</button>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ioK-2h-a8C" userLabel="Choose Button">
|
||||
<rect key="frame" x="426" y="183" width="57" height="32"/>
|
||||
<rect key="frame" x="422" y="186" width="57" height="32"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="16"/>
|
||||
<state key="normal" title="Choose">
|
||||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||
|
|
@ -213,11 +211,13 @@
|
|||
</button>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="ioK-2h-a8C" firstAttribute="centerX" secondItem="QeN-lu-6hK" secondAttribute="centerX" multiplier="1.5" id="7tR-T3-Kb4"/>
|
||||
<constraint firstAttribute="bottom" secondItem="ioK-2h-a8C" secondAttribute="bottom" constant="10" id="Aj0-Vj-FTt"/>
|
||||
<constraint firstAttribute="trailing" secondItem="Cnz-mP-gE5" secondAttribute="trailing" id="BJe-4u-jQP"/>
|
||||
<constraint firstItem="peT-9h-pw6" firstAttribute="top" secondItem="QeN-lu-6hK" secondAttribute="top" constant="15" id="BWQ-EY-Oun"/>
|
||||
<constraint firstItem="Cnz-mP-gE5" firstAttribute="bottom" secondItem="peT-9h-pw6" secondAttribute="bottom" constant="140" id="RBw-gb-qhI"/>
|
||||
<constraint firstAttribute="height" constant="225" id="aRE-Ox-5IJ"/>
|
||||
<constraint firstItem="Iem-Jz-DfR" firstAttribute="centerX" secondItem="QeN-lu-6hK" secondAttribute="centerX" multiplier="0.5" id="Wrc-mh-qE1"/>
|
||||
<constraint firstAttribute="height" constant="228" id="aRE-Ox-5IJ"/>
|
||||
<constraint firstItem="peT-9h-pw6" firstAttribute="leading" secondItem="QeN-lu-6hK" secondAttribute="leading" constant="8" id="gjX-QW-MTM"/>
|
||||
<constraint firstAttribute="bottom" secondItem="Iem-Jz-DfR" secondAttribute="bottom" constant="10" id="nWl-5v-GE4"/>
|
||||
<constraint firstAttribute="trailing" secondItem="peT-9h-pw6" secondAttribute="trailing" constant="8" id="neB-S2-nGo"/>
|
||||
|
|
@ -226,15 +226,15 @@
|
|||
</view>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="Iem-Jz-DfR" firstAttribute="centerX" secondItem="uSU-qr-XnK" secondAttribute="centerX" constant="-1" id="0bt-RV-j9W"/>
|
||||
<constraint firstItem="cE0-0g-Su5" firstAttribute="top" secondItem="ZfS-wG-RjJ" secondAttribute="top" id="1Kz-qe-p3Y"/>
|
||||
<constraint firstItem="QeN-lu-6hK" firstAttribute="top" secondItem="cE0-0g-Su5" secondAttribute="bottom" id="DVo-pQ-Dg5"/>
|
||||
<constraint firstItem="cE0-0g-Su5" firstAttribute="centerX" secondItem="ZfS-wG-RjJ" secondAttribute="centerX" id="Fqd-7G-H68"/>
|
||||
<constraint firstItem="cE0-0g-Su5" firstAttribute="leading" secondItem="ZfS-wG-RjJ" secondAttribute="leading" id="IZE-p0-8AN"/>
|
||||
<constraint firstItem="Iem-Jz-DfR" firstAttribute="centerX" secondItem="uSU-qr-XnK" secondAttribute="centerX" id="Q6r-Zi-WDK"/>
|
||||
<constraint firstAttribute="bottom" secondItem="QeN-lu-6hK" secondAttribute="bottom" id="XIT-bd-OlA"/>
|
||||
<constraint firstItem="PkX-yh-JhO" firstAttribute="centerX" secondItem="ioK-2h-a8C" secondAttribute="centerX" id="bWf-Uj-Hfh"/>
|
||||
<constraint firstAttribute="trailing" secondItem="cE0-0g-Su5" secondAttribute="trailing" id="c8a-IH-WgO"/>
|
||||
<constraint firstItem="QeN-lu-6hK" firstAttribute="leading" secondItem="ZfS-wG-RjJ" secondAttribute="leading" id="e0b-PE-U5c"/>
|
||||
<constraint firstItem="PkX-yh-JhO" firstAttribute="centerX" secondItem="ioK-2h-a8C" secondAttribute="centerX" constant="-3.5" id="f58-YA-4qh"/>
|
||||
<constraint firstAttribute="trailing" secondItem="QeN-lu-6hK" secondAttribute="trailing" id="kbe-Uh-tug"/>
|
||||
</constraints>
|
||||
</scrollView>
|
||||
|
|
|
|||
|
|
@ -24,10 +24,6 @@
|
|||
//#import <AssetsLibrary/ALAsset.h>
|
||||
//#import <AssetsLibrary/ALAssetRepresentation.h>
|
||||
|
||||
#define MXKROOM_INPUT_TOOLBAR_VIEW_LARGE_IMAGE_SIZE 1024
|
||||
#define MXKROOM_INPUT_TOOLBAR_VIEW_MEDIUM_IMAGE_SIZE 768
|
||||
#define MXKROOM_INPUT_TOOLBAR_VIEW_SMALL_IMAGE_SIZE 512
|
||||
|
||||
@interface RoomInputToolbarView()
|
||||
{
|
||||
MediaPickerViewController *mediaPicker;
|
||||
|
|
|
|||
Loading…
Reference in a new issue