Skip to content

Commit

Permalink
Organized Files
Browse files Browse the repository at this point in the history
  • Loading branch information
@AdamBCo
AdamBCo committed Oct 17, 2015
1 parent c51dc59 commit c6dea9c
Show file tree
Hide file tree
Showing 13 changed files with 34 additions and 99 deletions.
12 changes: 0 additions & 12 deletions ABCIntroView.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
877BE69D1A83F7CE00FFCCFD /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 877BE69C1A83F7CE00FFCCFD /* main.m */; };
877BE6A01A83F7CE00FFCCFD /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 877BE69F1A83F7CE00FFCCFD /* AppDelegate.m */; };
877BE6A31A83F7CE00FFCCFD /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 877BE6A21A83F7CE00FFCCFD /* ViewController.m */; };
877BE6A61A83F7CE00FFCCFD /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 877BE6A41A83F7CE00FFCCFD /* Main.storyboard */; };
877BE6A81A83F7CE00FFCCFD /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 877BE6A71A83F7CE00FFCCFD /* Images.xcassets */; };
877BE6AB1A83F7CE00FFCCFD /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 877BE6A91A83F7CE00FFCCFD /* LaunchScreen.xib */; };
877BE6B71A83F7CE00FFCCFD /* ABCIntroViewTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 877BE6B61A83F7CE00FFCCFD /* ABCIntroViewTests.m */; };
Expand All @@ -35,7 +34,6 @@
877BE69F1A83F7CE00FFCCFD /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
877BE6A11A83F7CE00FFCCFD /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
877BE6A21A83F7CE00FFCCFD /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
877BE6A51A83F7CE00FFCCFD /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
877BE6A71A83F7CE00FFCCFD /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
877BE6AA1A83F7CE00FFCCFD /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
877BE6B01A83F7CE00FFCCFD /* ABCIntroViewTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ABCIntroViewTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -89,7 +87,6 @@
877BE6C31A83F8EE00FFCCFD /* Classes */,
877BE6A11A83F7CE00FFCCFD /* ViewController.h */,
877BE6A21A83F7CE00FFCCFD /* ViewController.m */,
877BE6A41A83F7CE00FFCCFD /* Main.storyboard */,
877BE6A71A83F7CE00FFCCFD /* Images.xcassets */,
877BE6A91A83F7CE00FFCCFD /* LaunchScreen.xib */,
877BE69A1A83F7CE00FFCCFD /* Supporting Files */,
Expand Down Expand Up @@ -212,7 +209,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
877BE6A61A83F7CE00FFCCFD /* Main.storyboard in Resources */,
877BE6AB1A83F7CE00FFCCFD /* LaunchScreen.xib in Resources */,
877BE6A81A83F7CE00FFCCFD /* Images.xcassets in Resources */,
);
Expand Down Expand Up @@ -258,14 +254,6 @@
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
877BE6A41A83F7CE00FFCCFD /* Main.storyboard */ = {
isa = PBXVariantGroup;
children = (
877BE6A51A83F7CE00FFCCFD /* Base */,
);
name = Main.storyboard;
sourceTree = "<group>";
};
877BE6A91A83F7CE00FFCCFD /* LaunchScreen.xib */ = {
isa = PBXVariantGroup;
children = (
Expand Down
Binary file modified ...proj/project.xcworkspace/xcuserdata/adamcooper.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
32 changes: 13 additions & 19 deletions ABCIntroView/ABCIntroView.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ - (instancetype)initWithFrame:(CGRect)frame{
self = [super initWithFrame:frame];
if(self){

UIImageView *backgroundImageView = [[UIImageView alloc] initWithFrame:self.frame];
backgroundImageView.image = [UIImage imageNamed:@"Intro_Screen_Background"];
[self addSubview:backgroundImageView];

[self addSubview:self.scrollView];
[self addSubview:self.pageControl];

Expand Down Expand Up @@ -64,7 +60,7 @@ -(UIView *)viewOne {
UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, self.frame.size.height*.05, self.frame.size.width*.8, 60)];
titleLabel.center = CGPointMake(self.center.x, self.frame.size.height*.1);
titleLabel.text = [NSString stringWithFormat:@"Pixifly"];
titleLabel.font = [UIFont fontWithName:@"HelveticaNeue" size:40.0];
titleLabel.font = [UIFont systemFontOfSize:40.0];
titleLabel.textColor = [UIColor whiteColor];
titleLabel.textAlignment = NSTextAlignmentCenter;
titleLabel.numberOfLines = 0;
Expand All @@ -77,7 +73,7 @@ -(UIView *)viewOne {

UILabel *descriptionLabel = [[UILabel alloc] initWithFrame:CGRectMake(self.frame.size.width*.1, self.frame.size.height*.7, self.frame.size.width*.8, 60)];
descriptionLabel.text = [NSString stringWithFormat:@"Description for First Screen."];
descriptionLabel.font = [UIFont fontWithName:@"HelveticaNeue-Thin" size:18.0];
descriptionLabel.font = [UIFont systemFontOfSize:18.0];
descriptionLabel.textColor = [UIColor whiteColor];
descriptionLabel.textAlignment = NSTextAlignmentCenter;
descriptionLabel.numberOfLines = 0;
Expand All @@ -102,7 +98,7 @@ -(UIView *)viewTwo {
UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, self.frame.size.height*.05, self.frame.size.width*.8, 60)];
titleLabel.center = CGPointMake(self.center.x, self.frame.size.height*.1);
titleLabel.text = [NSString stringWithFormat:@"DropShot"];
titleLabel.font = [UIFont fontWithName:@"HelveticaNeue" size:40.0];
titleLabel.font = [UIFont systemFontOfSize:40.0];
titleLabel.textColor = [UIColor whiteColor];
titleLabel.textAlignment = NSTextAlignmentCenter;
titleLabel.numberOfLines = 0;
Expand All @@ -115,7 +111,7 @@ -(UIView *)viewTwo {

UILabel *descriptionLabel = [[UILabel alloc] initWithFrame:CGRectMake(self.frame.size.width*.1, self.frame.size.height*.7, self.frame.size.width*.8, 60)];
descriptionLabel.text = [NSString stringWithFormat:@"Description for Second Screen."];
descriptionLabel.font = [UIFont fontWithName:@"HelveticaNeue-Thin" size:18.0];
descriptionLabel.font = [UIFont systemFontOfSize:18.0];
descriptionLabel.textColor = [UIColor whiteColor];
descriptionLabel.textAlignment = NSTextAlignmentCenter;
descriptionLabel.numberOfLines = 0;
Expand All @@ -140,7 +136,7 @@ -(UIView *)viewThree{
UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, self.frame.size.height*.05, self.frame.size.width*.8, 60)];
titleLabel.center = CGPointMake(self.center.x, self.frame.size.height*.1);
titleLabel.text = [NSString stringWithFormat:@"Shaktaya"];
titleLabel.font = [UIFont fontWithName:@"HelveticaNeue" size:40.0];
titleLabel.font = [UIFont systemFontOfSize:40.0];
titleLabel.textColor = [UIColor whiteColor];
titleLabel.textAlignment = NSTextAlignmentCenter;
titleLabel.numberOfLines = 0;
Expand All @@ -154,7 +150,7 @@ -(UIView *)viewThree{

UILabel *descriptionLabel = [[UILabel alloc] initWithFrame:CGRectMake(self.frame.size.width*.1, self.frame.size.height*.7, self.frame.size.width*.8, 60)];
descriptionLabel.text = [NSString stringWithFormat:@"Description for Third Screen."];
descriptionLabel.font = [UIFont fontWithName:@"HelveticaNeue-Thin" size:18.0];
descriptionLabel.font = [UIFont systemFontOfSize:18.0];
descriptionLabel.textColor = [UIColor whiteColor];
descriptionLabel.textAlignment = NSTextAlignmentCenter;
descriptionLabel.numberOfLines = 0;
Expand All @@ -179,7 +175,7 @@ -(UIView *)viewFour {
UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, self.frame.size.height*.05, self.frame.size.width*.8, 60)];
titleLabel.center = CGPointMake(self.center.x, self.frame.size.height*.1);
titleLabel.text = [NSString stringWithFormat:@"Punctual"];
titleLabel.font = [UIFont fontWithName:@"HelveticaNeue" size:40.0];
titleLabel.font = [UIFont systemFontOfSize:40.0];
titleLabel.textColor = [UIColor whiteColor];
titleLabel.textAlignment = NSTextAlignmentCenter;
titleLabel.numberOfLines = 0;
Expand All @@ -192,7 +188,7 @@ -(UIView *)viewFour {

UILabel *descriptionLabel = [[UILabel alloc] initWithFrame:CGRectMake(self.frame.size.width*.1, self.frame.size.height*.7, self.frame.size.width*.8, 60)];
descriptionLabel.text = [NSString stringWithFormat:@"Description for Fourth Screen."];
descriptionLabel.font = [UIFont fontWithName:@"HelveticaNeue-Thin" size:18.0];
descriptionLabel.font = [UIFont systemFontOfSize:18.0];
descriptionLabel.textColor = [UIColor whiteColor];
descriptionLabel.textAlignment = NSTextAlignmentCenter;
descriptionLabel.numberOfLines = 0;
Expand Down Expand Up @@ -220,23 +216,21 @@ -(UIScrollView *)scrollView {

-(UIPageControl *)pageControl {
if (!_pageControl) {
_pageControl = [[UIPageControl alloc] initWithFrame:CGRectMake(0, self.frame.size.height*.8, self.frame.size.width, 10)];
[_pageControl setCurrentPageIndicatorTintColor:[UIColor colorWithRed:0.153 green:0.533 blue:0.796 alpha:1.000]];
_pageControl = [[UIPageControl alloc] initWithFrame:CGRectMake(0, self.frame.size.height-80, self.frame.size.width, 10)];
[_pageControl setCurrentPageIndicatorTintColor:[UIColor colorWithRed:0.129 green:0.588 blue:0.953 alpha:1.000]];
[_pageControl setNumberOfPages:4];
}
return _pageControl;
}

-(UIButton *)doneButton {
if (!_doneButton) {
_doneButton = [[UIButton alloc] initWithFrame:CGRectMake(self.frame.size.width*.1, self.frame.size.height*.85, self.frame.size.width*.8, 60)];
_doneButton = [[UIButton alloc] initWithFrame:CGRectMake(0, self.frame.size.height-60, self.frame.size.width, 60)];
[_doneButton setTintColor:[UIColor whiteColor]];
[_doneButton setTitle:@"Let's Go!" forState:UIControlStateNormal];
[_doneButton.titleLabel setFont:[UIFont fontWithName:@"HelveticaNeue-Thin" size:18.0]];
[_doneButton setBackgroundColor:[UIColor colorWithRed:0.153 green:0.533 blue:0.796 alpha:1.000]];
[_doneButton.titleLabel setFont:[UIFont systemFontOfSize:18.0]];
[_doneButton setBackgroundColor:[UIColor colorWithRed:0.129 green:0.588 blue:0.953 alpha:1.000]];
[_doneButton addTarget:self.delegate action:@selector(onDoneButtonPressed) forControlEvents:UIControlEventTouchUpInside];
[_doneButton.layer setCornerRadius:5];
[_doneButton setClipsToBounds:YES];
}
return _doneButton;
}
Expand Down
10 changes: 9 additions & 1 deletion ABCIntroView/AppDelegate.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
//

#import "AppDelegate.h"
#import "ViewController.h"


@interface AppDelegate ()

Expand All @@ -16,7 +18,13 @@ @implementation AppDelegate


- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
// Override point for customization after application launch.

self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
[self.window makeKeyAndVisible];

ViewController *exampleViewController = [[ViewController alloc] init];
[self.window setRootViewController:exampleViewController];

return YES;
}

Expand Down
37 changes: 0 additions & 37 deletions ABCIntroView/Base.lproj/Main.storyboard
View file

This file was deleted.

6 changes: 6 additions & 0 deletions ABCIntroView/Images.xcassets/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file removed ...es.xcassets/Intro_Screen_Background.imageset/Blue-Blurry-Desktop-Background.jpg
View file
Binary file not shown.
21 changes: 0 additions & 21 deletions ABCIntroView/Images.xcassets/Intro_Screen_Background.imageset/Contents.json
View file

This file was deleted.

4 changes: 2 additions & 2 deletions ABCIntroView/Images.xcassets/Intro_Screen_One.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
},
{
"idiom" : "universal",
"scale" : "3x",
"filename" : "iTunesArtwork@2x.png"
"filename" : "iTunesArtwork@2x.png",
"scale" : "3x"
}
],
"info" : {
Expand Down
Binary file modified ABCIntroView/Images.xcassets/Intro_Screen_One.imageset/iTunesArtwork@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions ABCIntroView/Images.xcassets/Intro_Screen_Two.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
},
{
"idiom" : "universal",
"scale" : "3x",
"filename" : "iTunesArtwork@2x.png"
"filename" : "iTunesArtwork@2x.png",
"scale" : "3x"
}
],
"info" : {
Expand Down
4 changes: 0 additions & 4 deletions ABCIntroView/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,13 @@
<true/>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
</array>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
Expand Down
3 changes: 2 additions & 1 deletion ABCIntroView/ViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ - (void)viewDidLoad {
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
if (![defaults objectForKey:@"intro_screen_viewed"]) {
self.introView = [[ABCIntroView alloc] initWithFrame:self.view.frame];

self.introView.delegate = self;
self.introView.backgroundColor = [UIColor greenColor];
self.introView.backgroundColor = [UIColor colorWithWhite:0.149 alpha:1.000];
[self.view addSubview:self.introView];
}
}
Expand Down

0 comments on commit c6dea9c

Please sign in to comment.