Skip to content

Commit

Permalink
Update Demo
Browse files Browse the repository at this point in the history
  • Loading branch information
Ernesto Rivera committed Nov 13, 2014
1 parent 6d45ef6 commit 264414a
Show file tree
Hide file tree
Showing 96 changed files with 15,276 additions and 16,739 deletions.
2,495 changes: 628 additions & 1,867 deletions Demo/PickerDemo.xcodeproj/project.pbxproj
View file

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions Demo/PickerDemo/AdjustFilterButtonCell.xib
View file
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6245" systemVersion="14A343f" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<dependencies>
<deployment identifier="iOS"/>
<development version="5100" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
Expand Down
5 changes: 3 additions & 2 deletions Demo/PickerDemo/AdjustFilterSliderCell.xib
View file
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6245" systemVersion="14A343f" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<dependencies>
<deployment identifier="iOS"/>
<development version="5100" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
Expand Down
5 changes: 3 additions & 2 deletions Demo/PickerDemo/AdjustFilterSwitchCell.xib
View file
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6245" systemVersion="14A343f" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<dependencies>
<deployment identifier="iOS"/>
<development version="5100" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
Expand Down
5 changes: 3 additions & 2 deletions Demo/PickerDemo/AdjustFilterTitleCell.xib
View file
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6245" systemVersion="14A343f" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<dependencies>
<deployment identifier="iOS"/>
<development version="5100" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
Expand Down
7 changes: 5 additions & 2 deletions Demo/PickerDemo/AdjustFilterViewController.m
View file
Expand Up @@ -32,8 +32,11 @@ @implementation AdjustFilterViewController

+ (void)initialize
{
// Register our custom provider
[NBUFilterProvider addProvider:[CustomGPUImageFilterProvider class]];
if (self == [AdjustFilterViewController class])
{
// Register our custom provider
[NBUFilterProvider addProvider:[CustomGPUImageFilterProvider class]];
}
}

- (void)loadView
Expand Down
5 changes: 3 additions & 2 deletions Demo/PickerDemo/AdjustFilterViewController.xib
View file
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6245" systemVersion="14A343f" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<dependencies>
<deployment identifier="iOS"/>
<development version="5100" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AdjustFilterViewController">
Expand Down
5 changes: 3 additions & 2 deletions Demo/PickerDemo/AdjustFilterViewController_iPad.xib
View file
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="6245" systemVersion="14A343f" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
<dependencies>
<deployment identifier="iOS"/>
<development version="5100" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AdjustFilterViewController">
Expand Down
2 changes: 1 addition & 1 deletion Demo/PickerDemo/AssetsGroupViewController.m
View file
Expand Up @@ -32,7 +32,7 @@ - (void)viewDidLoad

// Add a next (continue) button
_nextButton = [[UIBarButtonItem alloc] initWithTitle:@"Next"
style:UIBarButtonItemStyleBordered
style:UIBarButtonItemStylePlain
target:self
action:@selector(pushSlideView:)];
self.navigationItem.rightBarButtonItem = _nextButton;
Expand Down
18 changes: 18 additions & 0 deletions Demo/PickerDemo/Images.xcassets/AppIcon.appiconset/Contents.json
View file
Expand Up @@ -12,12 +12,24 @@
"filename" : "Icon-Small@2x-1.png",
"scale" : "2x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "logo-1-1.png",
"scale" : "3x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "Icon-40@2x-1.png",
"scale" : "2x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "logo-1.png",
"scale" : "3x"
},
{
"size" : "57x57",
"idiom" : "iphone",
Expand All @@ -36,6 +48,12 @@
"filename" : "Icon-60@2x.png",
"scale" : "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "logo.png",
"scale" : "3x"
},
{
"size" : "29x29",
"idiom" : "ipad",
Expand Down
Binary file added Demo/PickerDemo/Images.xcassets/AppIcon.appiconset/logo-1-1.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Demo/PickerDemo/Images.xcassets/AppIcon.appiconset/logo-1.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Demo/PickerDemo/Images.xcassets/AppIcon.appiconset/logo.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
88 changes: 15 additions & 73 deletions Demo/PickerDemo/Images.xcassets/LaunchImage.launchimage/Contents.json
View file
@@ -1,48 +1,38 @@
{
"images" : [
{
"orientation" : "portrait",
"idiom" : "iphone",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"filename" : "名称未設定 2-1.png",
"scale" : "2x"
"idiom" : "iphone",
"subtype" : "736h",
"filename" : "名称未設定 2-3.png",
"minimum-system-version" : "8.0",
"orientation" : "portrait",
"scale" : "3x"
},
{
"extent" : "full-screen",
"idiom" : "iphone",
"subtype" : "retina4",
"filename" : "名称未設定 2.png",
"minimum-system-version" : "7.0",
"subtype" : "667h",
"filename" : "名称未設定 2-4.png",
"minimum-system-version" : "8.0",
"orientation" : "portrait",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "1x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "1x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"idiom" : "iphone",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"filename" : "名称未設定 2-1.png",
"scale" : "2x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
"idiom" : "iphone",
"subtype" : "retina4",
"filename" : "名称未設定 2.png",
"minimum-system-version" : "7.0",
"orientation" : "portrait",
"scale" : "2x"
},
{
Expand All @@ -66,54 +56,6 @@
"filename" : "名称未設定 2-2.png",
"subtype" : "retina4",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "to-status-bar",
"scale" : "1x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
"scale" : "1x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "to-status-bar",
"scale" : "1x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
"scale" : "1x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "to-status-bar",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
"scale" : "2x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "to-status-bar",
"scale" : "2x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
"scale" : "2x"
}
],
"info" : {
Expand Down
Binary file added Demo/PickerDemo/Images.xcassets/LaunchImage.launchimage/名称未設定 2-3.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Demo/PickerDemo/Images.xcassets/LaunchImage.launchimage/名称未設定 2-4.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions Demo/PickerDemo/Images.xcassets/first.imageset/Contents.json
View file
Expand Up @@ -9,6 +9,10 @@
"idiom" : "universal",
"scale" : "2x",
"filename" : "first@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
Expand Down
4 changes: 4 additions & 0 deletions Demo/PickerDemo/Images.xcassets/second.imageset/Contents.json
View file
Expand Up @@ -9,6 +9,10 @@
"idiom" : "universal",
"scale" : "2x",
"filename" : "second@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
Expand Down
2 changes: 2 additions & 0 deletions Demo/PickerDemo/LibraryViewController.h
View file
Expand Up @@ -18,6 +18,8 @@
// limitations under the License.
//

#import <NBUImagePicker/NBUAssetsLibraryViewController.h>

@interface LibraryViewController : NBUAssetsLibraryViewController

// Actions
Expand Down
12 changes: 7 additions & 5 deletions Demo/PickerDemo/LibraryViewController.m
View file
Expand Up @@ -25,9 +25,12 @@ @implementation LibraryViewController

+(void)initialize
{
// Register our custom directory albums
[[NBUAssetsLibrary sharedLibrary] registerDirectoryGroupforURL:[UIApplication sharedApplication].documentsDirectory
name:@"App's Documents directory"];
if (self == [LibraryViewController class])
{
// Register our custom directory albums
[[NBUAssetsLibrary sharedLibrary] registerDirectoryGroupforURL:[UIApplication sharedApplication].documentsDirectory
name:@"App's Documents directory"];
}
}

- (void)viewDidLoad
Expand All @@ -39,8 +42,7 @@ - (void)viewDidLoad

// Customization
self.customBackButtonTitle = @"Albums";
self.assetsGroupController = [[AssetsGroupViewController alloc] initWithNibName:@"NBUAssetsGroupViewController"
bundle:nil];
self.assetsGroupController = [self.storyboard instantiateViewControllerWithIdentifier:@"assetsGroupController"];
}

#pragma mark - Handling access authorization
Expand Down

0 comments on commit 264414a

Please sign in to comment.