Skip to content
This repository was archived by the owner on Jan 16, 2021. It is now read-only.

Commit ae76f60

Browse files
committed
Merge pull request #150 from ParsePlatform/nlutsenko.ios9
Fix ObjC ParseUIDemo for iOS 9.
2 parents 31dd837 + e0a3528 commit ae76f60

File tree

2 files changed

+47
-39
lines changed

2 files changed

+47
-39
lines changed

ParseUIDemo/Classes/CustomViewControllers/QueryCollectionViewController/DeletionCollectionViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ @implementation DeletionCollectionViewController
3737
- (instancetype)initWithClassName:(NSString *)className {
3838
self = [super initWithClassName:className];
3939
if (self) {
40-
self.title = @"Deletion Table";
40+
self.title = @"Deletion Collection";
4141
self.pullToRefreshEnabled = YES;
4242
self.objectsPerPage = 10;
4343
self.paginationEnabled = YES;

ParseUIDemo/Classes/PFUIDemoViewController.m

Lines changed: 46 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -97,50 +97,58 @@ - (instancetype)initWithStyle:(UITableViewStyle)style {
9797
}
9898

9999
- (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
100-
self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
101-
if (!self) return nil;
102-
103-
self.title = @"ParseUI Demo";
104-
_descriptions = @[ @"Simple Table",
105-
@"Paginated Table",
106-
@"Sectioned Table",
107-
@"Simple Storyboard Table",
108-
@"Deletion Table",
109-
@"Simple Collection",
110-
@"Paginated Collection",
111-
@"Sectioned Collection",
112-
@"Simple Storyboard Collection",
113-
@"Deletion Collection",
114-
@"Log In Default",
115-
@"Log In Username and Password",
116-
@"Log In Password Forgotten",
117-
@"Log In Done Button",
118-
@"Log In Email as Username",
119-
@"Log In Facebook",
120-
@"Log In Facebook and Twitter",
121-
@"Log In All",
122-
@"Log In All as Navigation",
123-
@"Log In Customized Background",
124-
@"Sign Up Default",
125-
@"Sign Up Username and Password",
126-
@"Sign Up Email",
127-
@"Sign Up Email And SignUp",
128-
@"Sign Up All",
129-
@"Sign Up Email as Username",
130-
@"Sign Up Minimum Password Length",
131-
@"Remote Image Table Default Style",
132-
@"Remote Image Table Subtitle Style",
133-
@"Remote Image Collection",
134-
@"Purchase",
135-
@"Custom Purchase" ];
136-
137-
return self;
100+
return [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
138101
}
139102

140103
- (instancetype)initWithCoder:(NSCoder *)decoder {
141104
return [self init];
142105
}
143106

107+
#pragma mark -
108+
#pragma mark View
109+
110+
- (void)viewDidLoad {
111+
[super viewDidLoad];
112+
113+
if (!self.title) {
114+
self.title = @"ParseUI Demo";
115+
}
116+
if (!_descriptions) {
117+
_descriptions = @[ @"Simple Table",
118+
@"Paginated Table",
119+
@"Sectioned Table",
120+
@"Simple Storyboard Table",
121+
@"Deletion Table",
122+
@"Simple Collection",
123+
@"Paginated Collection",
124+
@"Sectioned Collection",
125+
@"Simple Storyboard Collection",
126+
@"Deletion Collection",
127+
@"Log In Default",
128+
@"Log In Username and Password",
129+
@"Log In Password Forgotten",
130+
@"Log In Done Button",
131+
@"Log In Email as Username",
132+
@"Log In Facebook",
133+
@"Log In Facebook and Twitter",
134+
@"Log In All",
135+
@"Log In All as Navigation",
136+
@"Log In Customized Background",
137+
@"Sign Up Default",
138+
@"Sign Up Username and Password",
139+
@"Sign Up Email",
140+
@"Sign Up Email And SignUp",
141+
@"Sign Up All",
142+
@"Sign Up Email as Username",
143+
@"Sign Up Minimum Password Length",
144+
@"Remote Image Table Default Style",
145+
@"Remote Image Table Subtitle Style",
146+
@"Remote Image Collection",
147+
@"Purchase",
148+
@"Custom Purchase" ];
149+
}
150+
}
151+
144152
#pragma mark -
145153
#pragma mark UITableViewDataSource
146154

0 commit comments

Comments
 (0)