Skip to content

Commit c6dea9c

Browse files
AdamBCoAdamBCo
committed
Organized Files
1 parent c51dc59 commit c6dea9c

File tree

13 files changed

+34
-99
lines changed

13 files changed

+34
-99
lines changed

‎ABCIntroView.xcodeproj/project.pbxproj

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
877BE69D1A83F7CE00FFCCFD /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 877BE69C1A83F7CE00FFCCFD /* main.m */; };
1111
877BE6A01A83F7CE00FFCCFD /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 877BE69F1A83F7CE00FFCCFD /* AppDelegate.m */; };
1212
877BE6A31A83F7CE00FFCCFD /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 877BE6A21A83F7CE00FFCCFD /* ViewController.m */; };
13-
877BE6A61A83F7CE00FFCCFD /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 877BE6A41A83F7CE00FFCCFD /* Main.storyboard */; };
1413
877BE6A81A83F7CE00FFCCFD /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 877BE6A71A83F7CE00FFCCFD /* Images.xcassets */; };
1514
877BE6AB1A83F7CE00FFCCFD /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 877BE6A91A83F7CE00FFCCFD /* LaunchScreen.xib */; };
1615
877BE6B71A83F7CE00FFCCFD /* ABCIntroViewTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 877BE6B61A83F7CE00FFCCFD /* ABCIntroViewTests.m */; };
@@ -35,7 +34,6 @@
3534
877BE69F1A83F7CE00FFCCFD /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
3635
877BE6A11A83F7CE00FFCCFD /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
3736
877BE6A21A83F7CE00FFCCFD /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
38-
877BE6A51A83F7CE00FFCCFD /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
3937
877BE6A71A83F7CE00FFCCFD /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
4038
877BE6AA1A83F7CE00FFCCFD /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
4139
877BE6B01A83F7CE00FFCCFD /* ABCIntroViewTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ABCIntroViewTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -89,7 +87,6 @@
8987
877BE6C31A83F8EE00FFCCFD /* Classes */,
9088
877BE6A11A83F7CE00FFCCFD /* ViewController.h */,
9189
877BE6A21A83F7CE00FFCCFD /* ViewController.m */,
92-
877BE6A41A83F7CE00FFCCFD /* Main.storyboard */,
9390
877BE6A71A83F7CE00FFCCFD /* Images.xcassets */,
9491
877BE6A91A83F7CE00FFCCFD /* LaunchScreen.xib */,
9592
877BE69A1A83F7CE00FFCCFD /* Supporting Files */,
@@ -212,7 +209,6 @@
212209
isa = PBXResourcesBuildPhase;
213210
buildActionMask = 2147483647;
214211
files = (
215-
877BE6A61A83F7CE00FFCCFD /* Main.storyboard in Resources */,
216212
877BE6AB1A83F7CE00FFCCFD /* LaunchScreen.xib in Resources */,
217213
877BE6A81A83F7CE00FFCCFD /* Images.xcassets in Resources */,
218214
);
@@ -258,14 +254,6 @@
258254
/* End PBXTargetDependency section */
259255

260256
/* Begin PBXVariantGroup section */
261-
877BE6A41A83F7CE00FFCCFD /* Main.storyboard */ = {
262-
isa = PBXVariantGroup;
263-
children = (
264-
877BE6A51A83F7CE00FFCCFD /* Base */,
265-
);
266-
name = Main.storyboard;
267-
sourceTree = "<group>";
268-
};
269257
877BE6A91A83F7CE00FFCCFD /* LaunchScreen.xib */ = {
270258
isa = PBXVariantGroup;
271259
children = (

‎ABCIntroView.xcodeproj/project.xcworkspace/xcuserdata/adamcooper.xcuserdatad/UserInterfaceState.xcuserstate

1.19 KB
Binary file not shown.

‎ABCIntroView/ABCIntroView.m

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ - (instancetype)initWithFrame:(CGRect)frame{
2727
self = [super initWithFrame:frame];
2828
if(self){
2929

30-
UIImageView *backgroundImageView = [[UIImageView alloc] initWithFrame:self.frame];
31-
backgroundImageView.image = [UIImage imageNamed:@"Intro_Screen_Background"];
32-
[self addSubview:backgroundImageView];
33-
3430
[self addSubview:self.scrollView];
3531
[self addSubview:self.pageControl];
3632

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

7874
UILabel *descriptionLabel = [[UILabel alloc] initWithFrame:CGRectMake(self.frame.size.width*.1, self.frame.size.height*.7, self.frame.size.width*.8, 60)];
7975
descriptionLabel.text = [NSString stringWithFormat:@"Description for First Screen."];
80-
descriptionLabel.font = [UIFont fontWithName:@"HelveticaNeue-Thin" size:18.0];
76+
descriptionLabel.font = [UIFont systemFontOfSize:18.0];
8177
descriptionLabel.textColor = [UIColor whiteColor];
8278
descriptionLabel.textAlignment = NSTextAlignmentCenter;
8379
descriptionLabel.numberOfLines = 0;
@@ -102,7 +98,7 @@ -(UIView *)viewTwo {
10298
UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, self.frame.size.height*.05, self.frame.size.width*.8, 60)];
10399
titleLabel.center = CGPointMake(self.center.x, self.frame.size.height*.1);
104100
titleLabel.text = [NSString stringWithFormat:@"DropShot"];
105-
titleLabel.font = [UIFont fontWithName:@"HelveticaNeue" size:40.0];
101+
titleLabel.font = [UIFont systemFontOfSize:40.0];
106102
titleLabel.textColor = [UIColor whiteColor];
107103
titleLabel.textAlignment = NSTextAlignmentCenter;
108104
titleLabel.numberOfLines = 0;
@@ -115,7 +111,7 @@ -(UIView *)viewTwo {
115111

116112
UILabel *descriptionLabel = [[UILabel alloc] initWithFrame:CGRectMake(self.frame.size.width*.1, self.frame.size.height*.7, self.frame.size.width*.8, 60)];
117113
descriptionLabel.text = [NSString stringWithFormat:@"Description for Second Screen."];
118-
descriptionLabel.font = [UIFont fontWithName:@"HelveticaNeue-Thin" size:18.0];
114+
descriptionLabel.font = [UIFont systemFontOfSize:18.0];
119115
descriptionLabel.textColor = [UIColor whiteColor];
120116
descriptionLabel.textAlignment = NSTextAlignmentCenter;
121117
descriptionLabel.numberOfLines = 0;
@@ -140,7 +136,7 @@ -(UIView *)viewThree{
140136
UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, self.frame.size.height*.05, self.frame.size.width*.8, 60)];
141137
titleLabel.center = CGPointMake(self.center.x, self.frame.size.height*.1);
142138
titleLabel.text = [NSString stringWithFormat:@"Shaktaya"];
143-
titleLabel.font = [UIFont fontWithName:@"HelveticaNeue" size:40.0];
139+
titleLabel.font = [UIFont systemFontOfSize:40.0];
144140
titleLabel.textColor = [UIColor whiteColor];
145141
titleLabel.textAlignment = NSTextAlignmentCenter;
146142
titleLabel.numberOfLines = 0;
@@ -154,7 +150,7 @@ -(UIView *)viewThree{
154150

155151
UILabel *descriptionLabel = [[UILabel alloc] initWithFrame:CGRectMake(self.frame.size.width*.1, self.frame.size.height*.7, self.frame.size.width*.8, 60)];
156152
descriptionLabel.text = [NSString stringWithFormat:@"Description for Third Screen."];
157-
descriptionLabel.font = [UIFont fontWithName:@"HelveticaNeue-Thin" size:18.0];
153+
descriptionLabel.font = [UIFont systemFontOfSize:18.0];
158154
descriptionLabel.textColor = [UIColor whiteColor];
159155
descriptionLabel.textAlignment = NSTextAlignmentCenter;
160156
descriptionLabel.numberOfLines = 0;
@@ -179,7 +175,7 @@ -(UIView *)viewFour {
179175
UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, self.frame.size.height*.05, self.frame.size.width*.8, 60)];
180176
titleLabel.center = CGPointMake(self.center.x, self.frame.size.height*.1);
181177
titleLabel.text = [NSString stringWithFormat:@"Punctual"];
182-
titleLabel.font = [UIFont fontWithName:@"HelveticaNeue" size:40.0];
178+
titleLabel.font = [UIFont systemFontOfSize:40.0];
183179
titleLabel.textColor = [UIColor whiteColor];
184180
titleLabel.textAlignment = NSTextAlignmentCenter;
185181
titleLabel.numberOfLines = 0;
@@ -192,7 +188,7 @@ -(UIView *)viewFour {
192188

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

221217
-(UIPageControl *)pageControl {
222218
if (!_pageControl) {
223-
_pageControl = [[UIPageControl alloc] initWithFrame:CGRectMake(0, self.frame.size.height*.8, self.frame.size.width, 10)];
224-
[_pageControl setCurrentPageIndicatorTintColor:[UIColor colorWithRed:0.153 green:0.533 blue:0.796 alpha:1.000]];
219+
_pageControl = [[UIPageControl alloc] initWithFrame:CGRectMake(0, self.frame.size.height-80, self.frame.size.width, 10)];
220+
[_pageControl setCurrentPageIndicatorTintColor:[UIColor colorWithRed:0.129 green:0.588 blue:0.953 alpha:1.000]];
225221
[_pageControl setNumberOfPages:4];
226222
}
227223
return _pageControl;
228224
}
229225

230226
-(UIButton *)doneButton {
231227
if (!_doneButton) {
232-
_doneButton = [[UIButton alloc] initWithFrame:CGRectMake(self.frame.size.width*.1, self.frame.size.height*.85, self.frame.size.width*.8, 60)];
228+
_doneButton = [[UIButton alloc] initWithFrame:CGRectMake(0, self.frame.size.height-60, self.frame.size.width, 60)];
233229
[_doneButton setTintColor:[UIColor whiteColor]];
234230
[_doneButton setTitle:@"Let's Go!" forState:UIControlStateNormal];
235-
[_doneButton.titleLabel setFont:[UIFont fontWithName:@"HelveticaNeue-Thin" size:18.0]];
236-
[_doneButton setBackgroundColor:[UIColor colorWithRed:0.153 green:0.533 blue:0.796 alpha:1.000]];
231+
[_doneButton.titleLabel setFont:[UIFont systemFontOfSize:18.0]];
232+
[_doneButton setBackgroundColor:[UIColor colorWithRed:0.129 green:0.588 blue:0.953 alpha:1.000]];
237233
[_doneButton addTarget:self.delegate action:@selector(onDoneButtonPressed) forControlEvents:UIControlEventTouchUpInside];
238-
[_doneButton.layer setCornerRadius:5];
239-
[_doneButton setClipsToBounds:YES];
240234
}
241235
return _doneButton;
242236
}

‎ABCIntroView/AppDelegate.m

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
//
88

99
#import "AppDelegate.h"
10+
#import "ViewController.h"
11+
1012

1113
@interface AppDelegate ()
1214

@@ -16,7 +18,13 @@ @implementation AppDelegate
1618

1719

1820
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
19-
// Override point for customization after application launch.
21+
22+
self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
23+
[self.window makeKeyAndVisible];
24+
25+
ViewController *exampleViewController = [[ViewController alloc] init];
26+
[self.window setRootViewController:exampleViewController];
27+
2028
return YES;
2129
}
2230

‎ABCIntroView/Base.lproj/Main.storyboard

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎ABCIntroView/Images.xcassets/Contents.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"version" : 1,
4+
"author" : "xcode"
5+
}
6+
}

‎ABCIntroView/Images.xcassets/Intro_Screen_Background.imageset/Blue-Blurry-Desktop-Background.jpg

-250 KB
Binary file not shown.

‎ABCIntroView/Images.xcassets/Intro_Screen_Background.imageset/Contents.json

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎ABCIntroView/Images.xcassets/Intro_Screen_One.imageset/Contents.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
},
1111
{
1212
"idiom" : "universal",
13-
"scale" : "3x",
14-
"filename" : "[email protected]"
13+
"filename" : "[email protected]",
14+
"scale" : "3x"
1515
}
1616
],
1717
"info" : {

‎ABCIntroView/Images.xcassets/Intro_Screen_One.imageset/[email protected]

43.4 KB
Loading

‎ABCIntroView/Images.xcassets/Intro_Screen_Two.imageset/Contents.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
},
1111
{
1212
"idiom" : "universal",
13-
"scale" : "3x",
14-
"filename" : "[email protected]"
13+
"filename" : "[email protected]",
14+
"scale" : "3x"
1515
}
1616
],
1717
"info" : {

‎ABCIntroView/Info.plist

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,13 @@
2424
<true/>
2525
<key>UILaunchStoryboardName</key>
2626
<string>LaunchScreen</string>
27-
<key>UIMainStoryboardFile</key>
28-
<string>Main</string>
2927
<key>UIRequiredDeviceCapabilities</key>
3028
<array>
3129
<string>armv7</string>
3230
</array>
3331
<key>UISupportedInterfaceOrientations</key>
3432
<array>
3533
<string>UIInterfaceOrientationPortrait</string>
36-
<string>UIInterfaceOrientationLandscapeLeft</string>
37-
<string>UIInterfaceOrientationLandscapeRight</string>
3834
</array>
3935
<key>UISupportedInterfaceOrientations~ipad</key>
4036
<array>

‎ABCIntroView/ViewController.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ - (void)viewDidLoad {
2222
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
2323
if (![defaults objectForKey:@"intro_screen_viewed"]) {
2424
self.introView = [[ABCIntroView alloc] initWithFrame:self.view.frame];
25+
2526
self.introView.delegate = self;
26-
self.introView.backgroundColor = [UIColor greenColor];
27+
self.introView.backgroundColor = [UIColor colorWithWhite:0.149 alpha:1.000];
2728
[self.view addSubview:self.introView];
2829
}
2930
}

0 commit comments

Comments
 (0)