Skip to content

Commit 974ddff

Browse files
committed
Merge pull request #66 from mamaral/repo-cleanup
Repo cleanup
2 parents b3f2f05 + 7557810 commit 974ddff

Some content is hidden

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

61 files changed

+81
-1317
lines changed
File renamed without changes.

Objective-C/Onboard/AppDelegate.m Demo/Demo Files/AppDelegate.m

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#import "AppDelegate.h"
1010
#import "OnboardingViewController.h"
1111
#import "OnboardingContentViewController.h"
12-
#import "MyOnboardingViewController.h"
1312

1413
static NSString * const kUserHasOnboardedKey = @"user_has_onboarded";
1514

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Objective-C/Onboard.xcodeproj/project.pbxproj Demo/Onboard.xcodeproj/project.pbxproj

+24-29
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
273D50D419A1A34F00E38DB2 /* OnboardTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 273D50D319A1A34F00E38DB2 /* OnboardTests.m */; };
3131
273D50DF19A1A49C00E38DB2 /* OnboardingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 273D50DE19A1A49C00E38DB2 /* OnboardingViewController.m */; };
3232
273D50E219A1A4BF00E38DB2 /* OnboardingContentViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 273D50E119A1A4BF00E38DB2 /* OnboardingContentViewController.m */; };
33-
274E5B151A8C51ED009765AB /* MyOnboardingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 274E5B141A8C51ED009765AB /* MyOnboardingViewController.m */; };
3433
274E5B191A8C558D009765AB /* MBProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 274E5B181A8C558D009765AB /* MBProgressHUD.m */; };
3534
27535AD019BBCA070017811B /* tree.png in Resources */ = {isa = PBXBuildFile; fileRef = 27535ACF19BBCA070017811B /* tree.png */; };
3635
27535AD219BBD1F00017811B /* yellowbg.png in Resources */ = {isa = PBXBuildFile; fileRef = 27535AD119BBD1F00017811B /* yellowbg.png */; };
@@ -88,8 +87,6 @@
8887
273D50DE19A1A49C00E38DB2 /* OnboardingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OnboardingViewController.m; sourceTree = "<group>"; };
8988
273D50E019A1A4BF00E38DB2 /* OnboardingContentViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OnboardingContentViewController.h; sourceTree = "<group>"; };
9089
273D50E119A1A4BF00E38DB2 /* OnboardingContentViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OnboardingContentViewController.m; sourceTree = "<group>"; };
91-
274E5B131A8C51ED009765AB /* MyOnboardingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyOnboardingViewController.h; sourceTree = "<group>"; };
92-
274E5B141A8C51ED009765AB /* MyOnboardingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyOnboardingViewController.m; sourceTree = "<group>"; };
9390
274E5B171A8C558D009765AB /* MBProgressHUD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MBProgressHUD.h; sourceTree = "<group>"; };
9491
274E5B181A8C558D009765AB /* MBProgressHUD.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MBProgressHUD.m; sourceTree = "<group>"; };
9592
27535ACF19BBCA070017811B /* tree.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tree.png; sourceTree = "<group>"; };
@@ -159,13 +156,14 @@
159156
270CB0C119BAC93700F051B3 /* space3.png */,
160157
270CB0C219BAC93700F051B3 /* space4.png */,
161158
);
162-
name = media;
159+
path = media;
163160
sourceTree = "<group>";
164161
};
165162
273D50A219A1A34F00E38DB2 = {
166163
isa = PBXGroup;
167164
children = (
168-
273D50B419A1A34F00E38DB2 /* Onboard */,
165+
273D50B419A1A34F00E38DB2 /* Source */,
166+
275280F219A45909007FBD47 /* Demo Files */,
169167
);
170168
sourceTree = "<group>";
171169
};
@@ -175,8 +173,7 @@
175173
273D50AB19A1A34F00E38DB2 /* Onboard.app */,
176174
273D50C619A1A34F00E38DB2 /* OnboardTests.xctest */,
177175
);
178-
name = Products;
179-
path = ..;
176+
path = Products;
180177
sourceTree = "<group>";
181178
};
182179
273D50AD19A1A34F00E38DB2 /* Frameworks */ = {
@@ -187,20 +184,19 @@
187184
273D50B219A1A34F00E38DB2 /* UIKit.framework */,
188185
273D50C719A1A34F00E38DB2 /* XCTest.framework */,
189186
);
190-
name = Frameworks;
191-
path = ..;
187+
path = Frameworks;
192188
sourceTree = "<group>";
193189
};
194-
273D50B419A1A34F00E38DB2 /* Onboard */ = {
190+
273D50B419A1A34F00E38DB2 /* Source */ = {
195191
isa = PBXGroup;
196192
children = (
197193
273D50DD19A1A49C00E38DB2 /* OnboardingViewController.h */,
198194
273D50DE19A1A49C00E38DB2 /* OnboardingViewController.m */,
199195
273D50E019A1A4BF00E38DB2 /* OnboardingContentViewController.h */,
200196
273D50E119A1A4BF00E38DB2 /* OnboardingContentViewController.m */,
201-
275280F219A45909007FBD47 /* Demo */,
202197
);
203-
path = Onboard;
198+
name = Source;
199+
path = ../Source;
204200
sourceTree = "<group>";
205201
};
206202
273D50B519A1A34F00E38DB2 /* Supporting Files */ = {
@@ -211,7 +207,7 @@
211207
273D50BA19A1A34F00E38DB2 /* main.m */,
212208
273D50BC19A1A34F00E38DB2 /* Onboard-Prefix.pch */,
213209
);
214-
name = "Supporting Files";
210+
path = "Supporting Files";
215211
sourceTree = "<group>";
216212
};
217213
273D50CD19A1A34F00E38DB2 /* OnboardTests */ = {
@@ -221,15 +217,15 @@
221217
273D50CE19A1A34F00E38DB2 /* Supporting Files */,
222218
);
223219
path = OnboardTests;
224-
sourceTree = SOURCE_ROOT;
220+
sourceTree = "<group>";
225221
};
226222
273D50CE19A1A34F00E38DB2 /* Supporting Files */ = {
227223
isa = PBXGroup;
228224
children = (
229225
273D50CF19A1A34F00E38DB2 /* OnboardTests-Info.plist */,
230226
273D50D019A1A34F00E38DB2 /* InfoPlist.strings */,
231227
);
232-
name = "Supporting Files";
228+
path = "Supporting Files";
233229
sourceTree = "<group>";
234230
};
235231
274E5B161A8C552B009765AB /* Externals */ = {
@@ -238,16 +234,14 @@
238234
274E5B171A8C558D009765AB /* MBProgressHUD.h */,
239235
274E5B181A8C558D009765AB /* MBProgressHUD.m */,
240236
);
241-
name = Externals;
237+
path = Externals;
242238
sourceTree = "<group>";
243239
};
244-
275280F219A45909007FBD47 /* Demo */ = {
240+
275280F219A45909007FBD47 /* Demo Files */ = {
245241
isa = PBXGroup;
246242
children = (
247243
273D50BD19A1A34F00E38DB2 /* AppDelegate.h */,
248244
273D50BE19A1A34F00E38DB2 /* AppDelegate.m */,
249-
274E5B131A8C51ED009765AB /* MyOnboardingViewController.h */,
250-
274E5B141A8C51ED009765AB /* MyOnboardingViewController.m */,
251245
273D50C019A1A34F00E38DB2 /* Images.xcassets */,
252246
274E5B161A8C552B009765AB /* Externals */,
253247
273D50B519A1A34F00E38DB2 /* Supporting Files */,
@@ -256,7 +250,7 @@
256250
273D50AC19A1A34F00E38DB2 /* Products */,
257251
270CB0B419BABF8C00F051B3 /* media */,
258252
);
259-
name = Demo;
253+
path = "Demo Files";
260254
sourceTree = "<group>";
261255
};
262256
/* End PBXGroup section */
@@ -382,7 +376,6 @@
382376
273D50BF19A1A34F00E38DB2 /* AppDelegate.m in Sources */,
383377
273D50BB19A1A34F00E38DB2 /* main.m in Sources */,
384378
273D50E219A1A4BF00E38DB2 /* OnboardingContentViewController.m in Sources */,
385-
274E5B151A8C51ED009765AB /* MyOnboardingViewController.m in Sources */,
386379
);
387380
runOnlyForDeploymentPostprocessing = 0;
388381
};
@@ -411,6 +404,7 @@
411404
273D50B819A1A34F00E38DB2 /* en */,
412405
);
413406
name = InfoPlist.strings;
407+
path = .;
414408
sourceTree = "<group>";
415409
};
416410
273D50D019A1A34F00E38DB2 /* InfoPlist.strings */ = {
@@ -419,6 +413,7 @@
419413
273D50D119A1A34F00E38DB2 /* en */,
420414
);
421415
name = InfoPlist.strings;
416+
path = .;
422417
sourceTree = "<group>";
423418
};
424419
/* End PBXVariantGroup section */
@@ -502,8 +497,8 @@
502497
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
503498
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
504499
GCC_PRECOMPILE_PREFIX_HEADER = YES;
505-
GCC_PREFIX_HEADER = "Onboard/Onboard-Prefix.pch";
506-
INFOPLIST_FILE = "Onboard/Onboard-Info.plist";
500+
GCC_PREFIX_HEADER = "Demo Files/Supporting Files/Onboard-Prefix.pch";
501+
INFOPLIST_FILE = "Demo Files/Supporting Files/Onboard-Info.plist";
507502
PRODUCT_NAME = "$(TARGET_NAME)";
508503
WRAPPER_EXTENSION = app;
509504
};
@@ -515,8 +510,8 @@
515510
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
516511
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
517512
GCC_PRECOMPILE_PREFIX_HEADER = YES;
518-
GCC_PREFIX_HEADER = "Onboard/Onboard-Prefix.pch";
519-
INFOPLIST_FILE = "Onboard/Onboard-Info.plist";
513+
GCC_PREFIX_HEADER = "Demo Files/Supporting Files/Onboard-Prefix.pch";
514+
INFOPLIST_FILE = "Demo Files/Supporting Files/Onboard-Info.plist";
520515
PRODUCT_NAME = "$(TARGET_NAME)";
521516
WRAPPER_EXTENSION = app;
522517
};
@@ -532,12 +527,12 @@
532527
"$(DEVELOPER_FRAMEWORKS_DIR)",
533528
);
534529
GCC_PRECOMPILE_PREFIX_HEADER = YES;
535-
GCC_PREFIX_HEADER = "Onboard/Onboard-Prefix.pch";
530+
GCC_PREFIX_HEADER = "Demo Files/Supporting Files/Onboard-Prefix.pch";
536531
GCC_PREPROCESSOR_DEFINITIONS = (
537532
"DEBUG=1",
538533
"$(inherited)",
539534
);
540-
INFOPLIST_FILE = "OnboardTests/OnboardTests-Info.plist";
535+
INFOPLIST_FILE = "Demo Files/OnboardTests/Supporting Files/OnboardTests-Info.plist";
541536
PRODUCT_NAME = "$(TARGET_NAME)";
542537
TEST_HOST = "$(BUNDLE_LOADER)";
543538
WRAPPER_EXTENSION = xctest;
@@ -554,8 +549,8 @@
554549
"$(DEVELOPER_FRAMEWORKS_DIR)",
555550
);
556551
GCC_PRECOMPILE_PREFIX_HEADER = YES;
557-
GCC_PREFIX_HEADER = "Onboard/Onboard-Prefix.pch";
558-
INFOPLIST_FILE = "OnboardTests/OnboardTests-Info.plist";
552+
GCC_PREFIX_HEADER = "Demo Files/Supporting Files/Onboard-Prefix.pch";
553+
INFOPLIST_FILE = "Demo Files/OnboardTests/Supporting Files/OnboardTests-Info.plist";
559554
PRODUCT_NAME = "$(TARGET_NAME)";
560555
TEST_HOST = "$(BUNDLE_LOADER)";
561556
WRAPPER_EXTENSION = xctest;

Objective-C/Onboard/MyOnboardingViewController.h

-15
This file was deleted.

Objective-C/Onboard/MyOnboardingViewController.m

-69
This file was deleted.

Onboard.podspec

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
Pod::Spec.new do |s|
22

33
s.name = "Onboard"
4-
s.version = "2.1.5"
5-
s.summary = "Onboard provides devs with a quick and easy way to create an engaging, and useful onboarding experience with only a few lines of code."
4+
s.version = "2.1.6"
5+
s.summary = "Create a beautiful and engaging onboarding experience with only a few lines of code."
66
s.homepage = "https://github.com/mamaral/Onboard"
77
s.license = "MIT"
88
s.author = { "Mike Amaral" => "[email protected]" }
99
s.social_media_url = "http://twitter.com/MikeAmaral"
1010
s.platform = :ios
11-
s.source = { :git => "https://github.com/mamaral/Onboard.git", :tag => "v2.1.5" }
12-
s.source_files = "Objective-C/Onboard/OnboardingViewController.{h,m}", "Objective-C/Onboard/OnboardingContentViewController.{h,m}"
11+
s.source = { :git => "https://github.com/mamaral/Onboard.git", :tag => "v2.1.6" }
12+
s.source_files = "Source/OnboardingViewController.{h,m}", "Source/OnboardingContentViewController.{h,m}"
1313
s.requires_arc = true
1414

1515
end

0 commit comments

Comments
 (0)