Skip to content

Commit 264414a

Browse files
author
Ernesto Rivera
committed
Update Demo
1 parent 6d45ef6 commit 264414a

File tree

96 files changed

+15276
-16739
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+15276
-16739
lines changed

‎Demo/PickerDemo.xcodeproj/project.pbxproj

+628-1,867
Large diffs are not rendered by default.

‎Demo/PickerDemo/AdjustFilterButtonCell.xib

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6245" systemVersion="14A343f" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
33
<dependencies>
4+
<deployment identifier="iOS"/>
45
<development version="5100" identifier="xcode"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
67
</dependencies>
78
<objects>
89
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>

‎Demo/PickerDemo/AdjustFilterSliderCell.xib

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6245" systemVersion="14A343f" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
33
<dependencies>
4+
<deployment identifier="iOS"/>
45
<development version="5100" identifier="xcode"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
67
</dependencies>
78
<objects>
89
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>

‎Demo/PickerDemo/AdjustFilterSwitchCell.xib

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6245" systemVersion="14A343f" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
33
<dependencies>
4+
<deployment identifier="iOS"/>
45
<development version="5100" identifier="xcode"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
67
</dependencies>
78
<objects>
89
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>

‎Demo/PickerDemo/AdjustFilterTitleCell.xib

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6245" systemVersion="14A343f" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
33
<dependencies>
4+
<deployment identifier="iOS"/>
45
<development version="5100" identifier="xcode"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
67
</dependencies>
78
<objects>
89
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>

‎Demo/PickerDemo/AdjustFilterViewController.m

+5-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,11 @@ @implementation AdjustFilterViewController
3232

3333
+ (void)initialize
3434
{
35-
// Register our custom provider
36-
[NBUFilterProvider addProvider:[CustomGPUImageFilterProvider class]];
35+
if (self == [AdjustFilterViewController class])
36+
{
37+
// Register our custom provider
38+
[NBUFilterProvider addProvider:[CustomGPUImageFilterProvider class]];
39+
}
3740
}
3841

3942
- (void)loadView

‎Demo/PickerDemo/AdjustFilterViewController.xib

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6245" systemVersion="14A343f" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
33
<dependencies>
4+
<deployment identifier="iOS"/>
45
<development version="5100" identifier="xcode"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
67
</dependencies>
78
<objects>
89
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AdjustFilterViewController">

‎Demo/PickerDemo/AdjustFilterViewController_iPad.xib

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="6245" systemVersion="14A343f" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
33
<dependencies>
4+
<deployment identifier="iOS"/>
45
<development version="5100" identifier="xcode"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
67
</dependencies>
78
<objects>
89
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AdjustFilterViewController">

‎Demo/PickerDemo/AssetsGroupViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ - (void)viewDidLoad
3232

3333
// Add a next (continue) button
3434
_nextButton = [[UIBarButtonItem alloc] initWithTitle:@"Next"
35-
style:UIBarButtonItemStyleBordered
35+
style:UIBarButtonItemStylePlain
3636
target:self
3737
action:@selector(pushSlideView:)];
3838
self.navigationItem.rightBarButtonItem = _nextButton;

‎Demo/PickerDemo/Images.xcassets/AppIcon.appiconset/Contents.json

+18
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,24 @@
1212
"filename" : "[email protected]",
1313
"scale" : "2x"
1414
},
15+
{
16+
"size" : "29x29",
17+
"idiom" : "iphone",
18+
"filename" : "logo-1-1.png",
19+
"scale" : "3x"
20+
},
1521
{
1622
"size" : "40x40",
1723
"idiom" : "iphone",
1824
"filename" : "[email protected]",
1925
"scale" : "2x"
2026
},
27+
{
28+
"size" : "40x40",
29+
"idiom" : "iphone",
30+
"filename" : "logo-1.png",
31+
"scale" : "3x"
32+
},
2133
{
2234
"size" : "57x57",
2335
"idiom" : "iphone",
@@ -36,6 +48,12 @@
3648
"filename" : "[email protected]",
3749
"scale" : "2x"
3850
},
51+
{
52+
"size" : "60x60",
53+
"idiom" : "iphone",
54+
"filename" : "logo.png",
55+
"scale" : "3x"
56+
},
3957
{
4058
"size" : "29x29",
4159
"idiom" : "ipad",

‎Demo/PickerDemo/Images.xcassets/AppIcon.appiconset/logo-1-1.png

12.8 KB
Loading

‎Demo/PickerDemo/Images.xcassets/AppIcon.appiconset/logo-1.png

21.1 KB
Loading

‎Demo/PickerDemo/Images.xcassets/AppIcon.appiconset/logo.png

43.9 KB
Loading

‎Demo/PickerDemo/Images.xcassets/LaunchImage.launchimage/Contents.json

+15-73
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,38 @@
11
{
22
"images" : [
33
{
4-
"orientation" : "portrait",
5-
"idiom" : "iphone",
64
"extent" : "full-screen",
7-
"minimum-system-version" : "7.0",
8-
"filename" : "名称未設定 2-1.png",
9-
"scale" : "2x"
5+
"idiom" : "iphone",
6+
"subtype" : "736h",
7+
"filename" : "名称未設定 2-3.png",
8+
"minimum-system-version" : "8.0",
9+
"orientation" : "portrait",
10+
"scale" : "3x"
1011
},
1112
{
1213
"extent" : "full-screen",
1314
"idiom" : "iphone",
14-
"subtype" : "retina4",
15-
"filename" : "名称未設定 2.png",
16-
"minimum-system-version" : "7.0",
15+
"subtype" : "667h",
16+
"filename" : "名称未設定 2-4.png",
17+
"minimum-system-version" : "8.0",
1718
"orientation" : "portrait",
1819
"scale" : "2x"
1920
},
2021
{
2122
"orientation" : "portrait",
22-
"idiom" : "ipad",
23-
"extent" : "full-screen",
24-
"minimum-system-version" : "7.0",
25-
"scale" : "1x"
26-
},
27-
{
28-
"orientation" : "landscape",
29-
"idiom" : "ipad",
30-
"extent" : "full-screen",
31-
"minimum-system-version" : "7.0",
32-
"scale" : "1x"
33-
},
34-
{
35-
"orientation" : "portrait",
36-
"idiom" : "ipad",
23+
"idiom" : "iphone",
3724
"extent" : "full-screen",
3825
"minimum-system-version" : "7.0",
26+
"filename" : "名称未設定 2-1.png",
3927
"scale" : "2x"
4028
},
4129
{
42-
"orientation" : "landscape",
43-
"idiom" : "ipad",
4430
"extent" : "full-screen",
31+
"idiom" : "iphone",
32+
"subtype" : "retina4",
33+
"filename" : "名称未設定 2.png",
4534
"minimum-system-version" : "7.0",
35+
"orientation" : "portrait",
4636
"scale" : "2x"
4737
},
4838
{
@@ -66,54 +56,6 @@
6656
"filename" : "名称未設定 2-2.png",
6757
"subtype" : "retina4",
6858
"scale" : "2x"
69-
},
70-
{
71-
"orientation" : "portrait",
72-
"idiom" : "ipad",
73-
"extent" : "to-status-bar",
74-
"scale" : "1x"
75-
},
76-
{
77-
"orientation" : "portrait",
78-
"idiom" : "ipad",
79-
"extent" : "full-screen",
80-
"scale" : "1x"
81-
},
82-
{
83-
"orientation" : "landscape",
84-
"idiom" : "ipad",
85-
"extent" : "to-status-bar",
86-
"scale" : "1x"
87-
},
88-
{
89-
"orientation" : "landscape",
90-
"idiom" : "ipad",
91-
"extent" : "full-screen",
92-
"scale" : "1x"
93-
},
94-
{
95-
"orientation" : "portrait",
96-
"idiom" : "ipad",
97-
"extent" : "to-status-bar",
98-
"scale" : "2x"
99-
},
100-
{
101-
"orientation" : "portrait",
102-
"idiom" : "ipad",
103-
"extent" : "full-screen",
104-
"scale" : "2x"
105-
},
106-
{
107-
"orientation" : "landscape",
108-
"idiom" : "ipad",
109-
"extent" : "to-status-bar",
110-
"scale" : "2x"
111-
},
112-
{
113-
"orientation" : "landscape",
114-
"idiom" : "ipad",
115-
"extent" : "full-screen",
116-
"scale" : "2x"
11759
}
11860
],
11961
"info" : {

‎Demo/PickerDemo/Images.xcassets/LaunchImage.launchimage/名称未設定 2-3.png

2.46 MB
Loading

‎Demo/PickerDemo/Images.xcassets/LaunchImage.launchimage/名称未設定 2-4.png

1.01 MB
Loading

‎Demo/PickerDemo/Images.xcassets/first.imageset/Contents.json

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
"idiom" : "universal",
1010
"scale" : "2x",
1111
"filename" : "[email protected]"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"scale" : "3x"
1216
}
1317
],
1418
"info" : {

‎Demo/PickerDemo/Images.xcassets/second.imageset/Contents.json

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
"idiom" : "universal",
1010
"scale" : "2x",
1111
"filename" : "[email protected]"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"scale" : "3x"
1216
}
1317
],
1418
"info" : {

‎Demo/PickerDemo/LibraryViewController.h

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
// limitations under the License.
1919
//
2020

21+
#import <NBUImagePicker/NBUAssetsLibraryViewController.h>
22+
2123
@interface LibraryViewController : NBUAssetsLibraryViewController
2224

2325
// Actions

‎Demo/PickerDemo/LibraryViewController.m

+7-5
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,12 @@ @implementation LibraryViewController
2525

2626
+(void)initialize
2727
{
28-
// Register our custom directory albums
29-
[[NBUAssetsLibrary sharedLibrary] registerDirectoryGroupforURL:[UIApplication sharedApplication].documentsDirectory
30-
name:@"App's Documents directory"];
28+
if (self == [LibraryViewController class])
29+
{
30+
// Register our custom directory albums
31+
[[NBUAssetsLibrary sharedLibrary] registerDirectoryGroupforURL:[UIApplication sharedApplication].documentsDirectory
32+
name:@"App's Documents directory"];
33+
}
3134
}
3235

3336
- (void)viewDidLoad
@@ -39,8 +42,7 @@ - (void)viewDidLoad
3942

4043
// Customization
4144
self.customBackButtonTitle = @"Albums";
42-
self.assetsGroupController = [[AssetsGroupViewController alloc] initWithNibName:@"NBUAssetsGroupViewController"
43-
bundle:nil];
45+
self.assetsGroupController = [self.storyboard instantiateViewControllerWithIdentifier:@"assetsGroupController"];
4446
}
4547

4648
#pragma mark - Handling access authorization

0 commit comments

Comments
 (0)