Skip to content
This repository was archived by the owner on Jun 19, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- WPMediaPicker (0.7.3)
- WPMediaPicker (0.8.0)

DEPENDENCIES:
- WPMediaPicker (from `../`)
Expand All @@ -9,6 +9,6 @@ EXTERNAL SOURCES:
:path: ../

SPEC CHECKSUMS:
WPMediaPicker: 6bbce465f5a5c071267ae28bdf31d0fd6e109721
WPMediaPicker: cc2e022caf5cfd1f3c517c794aa5e3a81e065b05

COCOAPODS: 0.39.0
4 changes: 2 additions & 2 deletions Example/WPMediaPicker.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down Expand Up @@ -504,7 +504,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
Expand Down
9 changes: 4 additions & 5 deletions Example/WPMediaPicker/DemoViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ - (void)viewDidLoad
[self.tableView registerClass:[WPMediaGroupTableViewCell class] forCellReuseIdentifier:NSStringFromClass([WPMediaGroupTableViewCell class])];
self.options = @{
MediaPickerOptionsShowMostRecentFirst:@(YES),
MediaPickerOptionsUsePhotosLibrary:@(YES),
MediaPickerOptionsShowCameraCapture:@(YES),
MediaPickerOptionsAllowMultipleSelection:@(YES)
};
Expand Down Expand Up @@ -115,12 +114,12 @@ - (void) showPicker:(id) sender
WPMediaPickerViewController *mediaPicker = [[WPMediaPickerViewController alloc] init];
mediaPicker.delegate = self;
mediaPicker.showMostRecentFirst = [self.options[MediaPickerOptionsShowMostRecentFirst] boolValue];
if ([self.options[MediaPickerOptionsUsePhotosLibrary] boolValue]){
self.customDataSource = [[WPPHAssetDataSource alloc] init];
mediaPicker.dataSource = self.customDataSource;
}
mediaPicker.allowCaptureOfMedia = [self.options[MediaPickerOptionsShowCameraCapture] boolValue];
mediaPicker.allowMultipleSelection = [self.options[MediaPickerOptionsAllowMultipleSelection] boolValue];
mediaPicker.modalPresentationStyle = UIModalPresentationPopover;
UIPopoverPresentationController *ppc = mediaPicker.popoverPresentationController;
ppc.barButtonItem = sender;

[self presentViewController:mediaPicker animated:YES completion:nil];
}

Expand Down
1 change: 0 additions & 1 deletion Example/WPMediaPicker/OptionsViewController.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import UIKit;

extern NSString const *MediaPickerOptionsShowMostRecentFirst;
extern NSString const *MediaPickerOptionsUsePhotosLibrary;
extern NSString const *MediaPickerOptionsShowCameraCapture;
extern NSString const *MediaPickerOptionsAllowMultipleSelection;

Expand Down
11 changes: 0 additions & 11 deletions Example/WPMediaPicker/OptionsViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

typedef NS_ENUM(NSInteger, OptionsViewControllerCell){
OptionsViewControllerCellShowMostRecentFirst,
OptionsViewControllerCellUsePhotosLibrary,
OptionsViewControllerCellShowCameraCapture,
OptionsViewControllerCellAllowMultipleSelection,
OptionsViewControllerCellTotal
Expand All @@ -16,7 +15,6 @@ typedef NS_ENUM(NSInteger, OptionsViewControllerCell){
@interface OptionsViewController ()

@property (nonatomic, strong) UITableViewCell *showMostRecentFirstCell;
@property (nonatomic, strong) UITableViewCell *usePhotosLibraryCell;
@property (nonatomic, strong) UITableViewCell *showCameraCaptureCell;
@property (nonatomic, strong) UITableViewCell *allowMultipleSelectionCell;

Expand All @@ -38,11 +36,6 @@ - (void)viewDidLoad
((UISwitch *)self.showMostRecentFirstCell.accessoryView).on = [self.options[MediaPickerOptionsShowMostRecentFirst] boolValue];
self.showMostRecentFirstCell.textLabel.text = @"Show Most Recent First";

self.usePhotosLibraryCell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:nil];
self.usePhotosLibraryCell.accessoryView = [[UISwitch alloc] init];
((UISwitch *)self.usePhotosLibraryCell.accessoryView).on = [self.options[MediaPickerOptionsUsePhotosLibrary] boolValue];
self.usePhotosLibraryCell.textLabel.text = @"Use Photos Library (iOS 8 Only)";

self.showCameraCaptureCell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:nil];
self.showCameraCaptureCell.accessoryView = [[UISwitch alloc] init];
((UISwitch *)self.showCameraCaptureCell.accessoryView).on = [self.options[MediaPickerOptionsShowCameraCapture] boolValue];
Expand Down Expand Up @@ -73,9 +66,6 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
case OptionsViewControllerCellShowMostRecentFirst:
return self.showMostRecentFirstCell;
break;
case OptionsViewControllerCellUsePhotosLibrary:
return self.usePhotosLibraryCell;
break;
case OptionsViewControllerCellShowCameraCapture:
return self.showCameraCaptureCell;
break;
Expand All @@ -94,7 +84,6 @@ - (void) done:(id) sender
id<OptionsViewControllerDelegate> delegate = self.delegate;
NSDictionary *newOptions = @{
MediaPickerOptionsShowMostRecentFirst:@(((UISwitch *)self.showMostRecentFirstCell.accessoryView).on),
MediaPickerOptionsUsePhotosLibrary:@(((UISwitch *)self.usePhotosLibraryCell.accessoryView).on),
MediaPickerOptionsShowCameraCapture:@(((UISwitch *)self.showCameraCaptureCell.accessoryView).on),
MediaPickerOptionsAllowMultipleSelection:@(((UISwitch *)self.allowMultipleSelectionCell.accessoryView).on)
};
Expand Down
24 changes: 0 additions & 24 deletions Pod/Classes/WPALAssetDataSource.h

This file was deleted.

Loading