Merge pull request #66 from mamaral/repo-cleanup

Repo cleanup
mamaral · Jul 31, 2015 · 974ddff · 974ddff
2 parents b3f2f05 + 7557810
commit 974ddff
Show file tree

Hide file tree

Showing 61 changed files with 81 additions and 1,317 deletions.
diff --git a/Objective-C/Onboard/AppDelegate.h → Demo/Demo Files/AppDelegate.h b/Objective-C/Onboard/AppDelegate.h → Demo/Demo Files/AppDelegate.h
diff --git a/Objective-C/Onboard/AppDelegate.m → Demo/Demo Files/AppDelegate.m b/Objective-C/Onboard/AppDelegate.m → Demo/Demo Files/AppDelegate.m
@@ -9,7 +9,6 @@
 #import "AppDelegate.h"
 #import "OnboardingViewController.h"
 #import "OnboardingContentViewController.h"
-#import "MyOnboardingViewController.h"
 
 static NSString * const kUserHasOnboardedKey = @"user_has_onboarded";
 

diff --git a/Objective-C/Onboard/MBProgressHUD.h → Demo/Demo Files/Externals/MBProgressHUD.h b/Objective-C/Onboard/MBProgressHUD.h → Demo/Demo Files/Externals/MBProgressHUD.h
diff --git a/Objective-C/Onboard/MBProgressHUD.m → Demo/Demo Files/Externals/MBProgressHUD.m b/Objective-C/Onboard/MBProgressHUD.m → Demo/Demo Files/Externals/MBProgressHUD.m
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/...ets/LaunchImage.launchimage/Contents.json → ...ets/LaunchImage.launchimage/Contents.json b/...ets/LaunchImage.launchimage/Contents.json → ...ets/LaunchImage.launchimage/Contents.json
diff --git a/Objective-C/OnboardTests/OnboardTests.m → Demo/Demo Files/OnboardTests/OnboardTests.m b/Objective-C/OnboardTests/OnboardTests.m → Demo/Demo Files/OnboardTests/OnboardTests.m
diff --git a/...ve-C/OnboardTests/OnboardTests-Info.plist → .../Supporting Files/OnboardTests-Info.plist b/...ve-C/OnboardTests/OnboardTests-Info.plist → .../Supporting Files/OnboardTests-Info.plist
diff --git a/...tive-C/Onboard/en.lproj/InfoPlist.strings → ...pporting Files/en.lproj/InfoPlist.strings b/...tive-C/Onboard/en.lproj/InfoPlist.strings → ...pporting Files/en.lproj/InfoPlist.strings
diff --git a/Objective-C/Onboard/Onboard-Info.plist → ...Files/Supporting Files/Onboard-Info.plist b/Objective-C/Onboard/Onboard-Info.plist → ...Files/Supporting Files/Onboard-Info.plist
diff --git a/Objective-C/Onboard/Onboard-Prefix.pch → ...Files/Supporting Files/Onboard-Prefix.pch b/Objective-C/Onboard/Onboard-Prefix.pch → ...Files/Supporting Files/Onboard-Prefix.pch
diff --git a/...C/OnboardTests/en.lproj/InfoPlist.strings → ...pporting Files/en.lproj/InfoPlist.strings b/...C/OnboardTests/en.lproj/InfoPlist.strings → ...pporting Files/en.lproj/InfoPlist.strings
diff --git a/Objective-C/Onboard/main.m → Demo/Demo Files/Supporting Files/main.m b/Objective-C/Onboard/main.m → Demo/Demo Files/Supporting Files/main.m
diff --git a/Objective-C/Onboard/blue.png → Demo/Demo Files/media/blue.png b/Objective-C/Onboard/blue.png → Demo/Demo Files/media/blue.png
diff --git a/Objective-C/Onboard/charcoal.png → Demo/Demo Files/media/charcoal.png b/Objective-C/Onboard/charcoal.png → Demo/Demo Files/media/charcoal.png
diff --git a/Objective-C/Onboard/coffee.png → Demo/Demo Files/media/coffee.png b/Objective-C/Onboard/coffee.png → Demo/Demo Files/media/coffee.png
diff --git a/Objective-C/Onboard/cone.png → Demo/Demo Files/media/cone.png b/Objective-C/Onboard/cone.png → Demo/Demo Files/media/cone.png
diff --git a/Objective-C/Onboard/headphones.png → Demo/Demo Files/media/headphones.png b/Objective-C/Onboard/headphones.png → Demo/Demo Files/media/headphones.png
diff --git a/Objective-C/Onboard/layers.png → Demo/Demo Files/media/layers.png b/Objective-C/Onboard/layers.png → Demo/Demo Files/media/layers.png
diff --git a/Objective-C/Onboard/milky_way.jpg → Demo/Demo Files/media/milky_way.jpg b/Objective-C/Onboard/milky_way.jpg → Demo/Demo Files/media/milky_way.jpg
diff --git a/Objective-C/Onboard/nasalization rg.ttf → Demo/Demo Files/media/nasalization rg.ttf b/Objective-C/Onboard/nasalization rg.ttf → Demo/Demo Files/media/nasalization rg.ttf
diff --git a/Objective-C/Onboard/purple.png → Demo/Demo Files/media/purple.png b/Objective-C/Onboard/purple.png → Demo/Demo Files/media/purple.png
diff --git a/Objective-C/Onboard/red.png → Demo/Demo Files/media/red.png b/Objective-C/Onboard/red.png → Demo/Demo Files/media/red.png
diff --git a/...ive-C/Onboard/sf-outer-limits.upright.ttf → ...o Files/media/sf-outer-limits.upright.ttf b/...ive-C/Onboard/sf-outer-limits.upright.ttf → ...o Files/media/sf-outer-limits.upright.ttf
diff --git a/Objective-C/Onboard/shark.png → Demo/Demo Files/media/shark.png b/Objective-C/Onboard/shark.png → Demo/Demo Files/media/shark.png
diff --git a/Objective-C/Onboard/space age.ttf → Demo/Demo Files/media/space age.ttf b/Objective-C/Onboard/space age.ttf → Demo/Demo Files/media/space age.ttf
diff --git a/Objective-C/Onboard/space1.png → Demo/Demo Files/media/space1.png b/Objective-C/Onboard/space1.png → Demo/Demo Files/media/space1.png
diff --git a/Objective-C/Onboard/space2.png → Demo/Demo Files/media/space2.png b/Objective-C/Onboard/space2.png → Demo/Demo Files/media/space2.png
diff --git a/Objective-C/Onboard/space3.png → Demo/Demo Files/media/space3.png b/Objective-C/Onboard/space3.png → Demo/Demo Files/media/space3.png
diff --git a/Objective-C/Onboard/space4.png → Demo/Demo Files/media/space4.png b/Objective-C/Onboard/space4.png → Demo/Demo Files/media/space4.png
diff --git a/Objective-C/Onboard/street.png → Demo/Demo Files/media/street.png b/Objective-C/Onboard/street.png → Demo/Demo Files/media/street.png
diff --git a/Objective-C/Onboard/sun.mp4 → Demo/Demo Files/media/sun.mp4 b/Objective-C/Onboard/sun.mp4 → Demo/Demo Files/media/sun.mp4
diff --git a/Objective-C/Onboard/testtube.png → Demo/Demo Files/media/testtube.png b/Objective-C/Onboard/testtube.png → Demo/Demo Files/media/testtube.png
diff --git a/Objective-C/Onboard/tree.png → Demo/Demo Files/media/tree.png b/Objective-C/Onboard/tree.png → Demo/Demo Files/media/tree.png
diff --git a/Objective-C/Onboard/yellow.png → Demo/Demo Files/media/yellow.png b/Objective-C/Onboard/yellow.png → Demo/Demo Files/media/yellow.png
diff --git a/Objective-C/Onboard/yellowbg.png → Demo/Demo Files/media/yellowbg.png b/Objective-C/Onboard/yellowbg.png → Demo/Demo Files/media/yellowbg.png
diff --git a/...ctive-C/Onboard.xcodeproj/project.pbxproj → Demo/Onboard.xcodeproj/project.pbxproj b/...ctive-C/Onboard.xcodeproj/project.pbxproj → Demo/Onboard.xcodeproj/project.pbxproj
@@ -30,7 +30,6 @@
 		273D50D419A1A34F00E38DB2 /* OnboardTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 273D50D319A1A34F00E38DB2 /* OnboardTests.m */; };
 		273D50DF19A1A49C00E38DB2 /* OnboardingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 273D50DE19A1A49C00E38DB2 /* OnboardingViewController.m */; };
 		273D50E219A1A4BF00E38DB2 /* OnboardingContentViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 273D50E119A1A4BF00E38DB2 /* OnboardingContentViewController.m */; };
-		274E5B151A8C51ED009765AB /* MyOnboardingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 274E5B141A8C51ED009765AB /* MyOnboardingViewController.m */; };
 		274E5B191A8C558D009765AB /* MBProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 274E5B181A8C558D009765AB /* MBProgressHUD.m */; };
 		27535AD019BBCA070017811B /* tree.png in Resources */ = {isa = PBXBuildFile; fileRef = 27535ACF19BBCA070017811B /* tree.png */; };
 		27535AD219BBD1F00017811B /* yellowbg.png in Resources */ = {isa = PBXBuildFile; fileRef = 27535AD119BBD1F00017811B /* yellowbg.png */; };
@@ -88,8 +87,6 @@
 		273D50DE19A1A49C00E38DB2 /* OnboardingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OnboardingViewController.m; sourceTree = "<group>"; };
 		273D50E019A1A4BF00E38DB2 /* OnboardingContentViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OnboardingContentViewController.h; sourceTree = "<group>"; };
 		273D50E119A1A4BF00E38DB2 /* OnboardingContentViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OnboardingContentViewController.m; sourceTree = "<group>"; };
-		274E5B131A8C51ED009765AB /* MyOnboardingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyOnboardingViewController.h; sourceTree = "<group>"; };
-		274E5B141A8C51ED009765AB /* MyOnboardingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyOnboardingViewController.m; sourceTree = "<group>"; };
 		274E5B171A8C558D009765AB /* MBProgressHUD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MBProgressHUD.h; sourceTree = "<group>"; };
 		274E5B181A8C558D009765AB /* MBProgressHUD.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MBProgressHUD.m; sourceTree = "<group>"; };
 		27535ACF19BBCA070017811B /* tree.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tree.png; sourceTree = "<group>"; };
@@ -159,13 +156,14 @@
 				270CB0C119BAC93700F051B3 /* space3.png */,
 				270CB0C219BAC93700F051B3 /* space4.png */,
 			);
-			name = media;
+			path = media;
 			sourceTree = "<group>";
 		};
 		273D50A219A1A34F00E38DB2 = {
 			isa = PBXGroup;
 			children = (
-				273D50B419A1A34F00E38DB2 /* Onboard */,
+				273D50B419A1A34F00E38DB2 /* Source */,
+				275280F219A45909007FBD47 /* Demo Files */,
 			);
 			sourceTree = "<group>";
 		};
@@ -175,8 +173,7 @@
 				273D50AB19A1A34F00E38DB2 /* Onboard.app */,
 				273D50C619A1A34F00E38DB2 /* OnboardTests.xctest */,
 			);
-			name = Products;
-			path = ..;
+			path = Products;
 			sourceTree = "<group>";
 		};
 		273D50AD19A1A34F00E38DB2 /* Frameworks */ = {
@@ -187,20 +184,19 @@
 				273D50B219A1A34F00E38DB2 /* UIKit.framework */,
 				273D50C719A1A34F00E38DB2 /* XCTest.framework */,
 			);
-			name = Frameworks;
-			path = ..;
+			path = Frameworks;
 			sourceTree = "<group>";
 		};
-		273D50B419A1A34F00E38DB2 /* Onboard */ = {
+		273D50B419A1A34F00E38DB2 /* Source */ = {
 			isa = PBXGroup;
 			children = (
 				273D50DD19A1A49C00E38DB2 /* OnboardingViewController.h */,
 				273D50DE19A1A49C00E38DB2 /* OnboardingViewController.m */,
 				273D50E019A1A4BF00E38DB2 /* OnboardingContentViewController.h */,
 				273D50E119A1A4BF00E38DB2 /* OnboardingContentViewController.m */,
-				275280F219A45909007FBD47 /* Demo */,
 			);
-			path = Onboard;
+			name = Source;
+			path = ../Source;
 			sourceTree = "<group>";
 		};
 		273D50B519A1A34F00E38DB2 /* Supporting Files */ = {
@@ -211,7 +207,7 @@
 				273D50BA19A1A34F00E38DB2 /* main.m */,
 				273D50BC19A1A34F00E38DB2 /* Onboard-Prefix.pch */,
 			);
-			name = "Supporting Files";
+			path = "Supporting Files";
 			sourceTree = "<group>";
 		};
 		273D50CD19A1A34F00E38DB2 /* OnboardTests */ = {
@@ -221,15 +217,15 @@
 				273D50CE19A1A34F00E38DB2 /* Supporting Files */,
 			);
 			path = OnboardTests;
-			sourceTree = SOURCE_ROOT;
+			sourceTree = "<group>";
 		};
 		273D50CE19A1A34F00E38DB2 /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
 				273D50CF19A1A34F00E38DB2 /* OnboardTests-Info.plist */,
 				273D50D019A1A34F00E38DB2 /* InfoPlist.strings */,
 			);
-			name = "Supporting Files";
+			path = "Supporting Files";
 			sourceTree = "<group>";
 		};
 		274E5B161A8C552B009765AB /* Externals */ = {
@@ -238,16 +234,14 @@
 				274E5B171A8C558D009765AB /* MBProgressHUD.h */,
 				274E5B181A8C558D009765AB /* MBProgressHUD.m */,
 			);
-			name = Externals;
+			path = Externals;
 			sourceTree = "<group>";
 		};
-		275280F219A45909007FBD47 /* Demo */ = {
+		275280F219A45909007FBD47 /* Demo Files */ = {
 			isa = PBXGroup;
 			children = (
 				273D50BD19A1A34F00E38DB2 /* AppDelegate.h */,
 				273D50BE19A1A34F00E38DB2 /* AppDelegate.m */,
-				274E5B131A8C51ED009765AB /* MyOnboardingViewController.h */,
-				274E5B141A8C51ED009765AB /* MyOnboardingViewController.m */,
 				273D50C019A1A34F00E38DB2 /* Images.xcassets */,
 				274E5B161A8C552B009765AB /* Externals */,
 				273D50B519A1A34F00E38DB2 /* Supporting Files */,
@@ -256,7 +250,7 @@
 				273D50AC19A1A34F00E38DB2 /* Products */,
 				270CB0B419BABF8C00F051B3 /* media */,
 			);
-			name = Demo;
+			path = "Demo Files";
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -382,7 +376,6 @@
 				273D50BF19A1A34F00E38DB2 /* AppDelegate.m in Sources */,
 				273D50BB19A1A34F00E38DB2 /* main.m in Sources */,
 				273D50E219A1A4BF00E38DB2 /* OnboardingContentViewController.m in Sources */,
-				274E5B151A8C51ED009765AB /* MyOnboardingViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -411,6 +404,7 @@
 				273D50B819A1A34F00E38DB2 /* en */,
 			);
 			name = InfoPlist.strings;
+			path = .;
 			sourceTree = "<group>";
 		};
 		273D50D019A1A34F00E38DB2 /* InfoPlist.strings */ = {
@@ -419,6 +413,7 @@
 				273D50D119A1A34F00E38DB2 /* en */,
 			);
 			name = InfoPlist.strings;
+			path = .;
 			sourceTree = "<group>";
 		};
 /* End PBXVariantGroup section */
@@ -502,8 +497,8 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "Onboard/Onboard-Prefix.pch";
-				INFOPLIST_FILE = "Onboard/Onboard-Info.plist";
+				GCC_PREFIX_HEADER = "Demo Files/Supporting Files/Onboard-Prefix.pch";
+				INFOPLIST_FILE = "Demo Files/Supporting Files/Onboard-Info.plist";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@@ -515,8 +510,8 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "Onboard/Onboard-Prefix.pch";
-				INFOPLIST_FILE = "Onboard/Onboard-Info.plist";
+				GCC_PREFIX_HEADER = "Demo Files/Supporting Files/Onboard-Prefix.pch";
+				INFOPLIST_FILE = "Demo Files/Supporting Files/Onboard-Info.plist";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@@ -532,12 +527,12 @@
 					"$(DEVELOPER_FRAMEWORKS_DIR)",
 				);
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "Onboard/Onboard-Prefix.pch";
+				GCC_PREFIX_HEADER = "Demo Files/Supporting Files/Onboard-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
 				);
-				INFOPLIST_FILE = "OnboardTests/OnboardTests-Info.plist";
+				INFOPLIST_FILE = "Demo Files/OnboardTests/Supporting Files/OnboardTests-Info.plist";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUNDLE_LOADER)";
 				WRAPPER_EXTENSION = xctest;
@@ -554,8 +549,8 @@
 					"$(DEVELOPER_FRAMEWORKS_DIR)",
 				);
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "Onboard/Onboard-Prefix.pch";
-				INFOPLIST_FILE = "OnboardTests/OnboardTests-Info.plist";
+				GCC_PREFIX_HEADER = "Demo Files/Supporting Files/Onboard-Prefix.pch";
+				INFOPLIST_FILE = "Demo Files/OnboardTests/Supporting Files/OnboardTests-Info.plist";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUNDLE_LOADER)";
 				WRAPPER_EXTENSION = xctest;

diff --git a/...j/xcshareddata/xcschemes/Onboard.xcscheme → ...j/xcshareddata/xcschemes/Onboard.xcscheme b/...j/xcshareddata/xcschemes/Onboard.xcscheme → ...j/xcshareddata/xcschemes/Onboard.xcscheme
diff --git a/Objective-C/Onboard/MyOnboardingViewController.h b/Objective-C/Onboard/MyOnboardingViewController.h
diff --git a/Objective-C/Onboard/MyOnboardingViewController.m b/Objective-C/Onboard/MyOnboardingViewController.m
diff --git a/Onboard.podspec b/Onboard.podspec
@@ -1,15 +1,15 @@
 Pod::Spec.new do |s|
 
   s.name         = "Onboard"
-  s.version      = "2.1.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."
+  s.version      = "2.1.6"
+  s.summary      = "Create a beautiful and engaging onboarding experience with only a few lines of code."
   s.homepage     = "https://github.com/mamaral/Onboard"
   s.license      = "MIT"
   s.author       = { "Mike Amaral" => "mike.amaral36@gmail.com" }
   s.social_media_url   = "http://twitter.com/MikeAmaral"
   s.platform     = :ios
-  s.source       = { :git => "https://github.com/mamaral/Onboard.git", :tag => "v2.1.5" }
-  s.source_files  = "Objective-C/Onboard/OnboardingViewController.{h,m}", "Objective-C/Onboard/OnboardingContentViewController.{h,m}"
+  s.source       = { :git => "https://github.com/mamaral/Onboard.git", :tag => "v2.1.6" }
+  s.source_files  = "Source/OnboardingViewController.{h,m}", "Source/OnboardingContentViewController.{h,m}"
   s.requires_arc = true
 
 end