Skip to content

Commit 777177c

Browse files
picutres added flags added needs more work
1 parent e281934 commit 777177c

File tree

130 files changed

+1169
-563
lines changed

Some content is hidden

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

130 files changed

+1169
-563
lines changed

[email protected]

901 KB
Loading

InfoScreen.png

738 KB
Loading

NationalRowingViewController.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@interface NationalRowingViewController : UIViewController <UIScrollViewDelegate>
1212

1313
@property (weak, nonatomic) IBOutlet UIScrollView *photoScroll;
14-
@property (weak, nonatomic) IBOutlet UIPageControl *photoPageControl;
14+
//@property (weak, nonatomic) IBOutlet UIPageControl *photoPageControl;
1515

1616
- (IBAction)pageControlValueChanged:(id)sender;
1717

NationalRowingViewController.m

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ @interface NationalRowingViewController ()
1414

1515
@implementation NationalRowingViewController
1616
@synthesize photoScroll;
17-
@synthesize photoPageControl;
17+
//@synthesize photoPageControl;
1818
@synthesize photoNum;
1919

2020
const CGFloat kScrollObjHeight = 199.0;
@@ -49,36 +49,39 @@ - (void)layoutScrollImages
4949
}
5050
}
5151
// set the content size so it can be scrollable
52-
[photoScroll setContentSize:CGSizeMake((kNumImages * kScrollObjWidth), [photoScroll bounds].size.height)];
52+
[photoScroll setContentSize:CGSizeMake(320,960)];
5353
}
5454

5555
- (void)viewDidLoad
5656
{
5757
[super viewDidLoad];
58-
[photoScroll setBackgroundColor:[UIColor blackColor]];
59-
[photoScroll setCanCancelContentTouches:NO];
60-
[photoScroll setDelegate:self];
61-
photoScroll.indicatorStyle = UIScrollViewIndicatorStyleWhite;
62-
photoScroll.clipsToBounds = YES;
63-
photoScroll.scrollEnabled = YES;
64-
photoScroll.pagingEnabled = YES;
65-
photoScroll.showsHorizontalScrollIndicator = NO;
66-
for (int i = 1; i <= kNumImages; i++)
67-
{
68-
NSString *imageName = [NSString stringWithFormat:@"image%d.jpg", i];
69-
UIImage *image = [UIImage imageNamed:imageName];
70-
UIImageView *imageView = [[UIImageView alloc] initWithImage:image];
71-
72-
CGRect rect = imageView.frame;
73-
rect.size.height = kScrollObjHeight;
74-
rect.size.width = kScrollObjWidth;
75-
imageView.frame = rect;
76-
imageView.tag = i;
77-
[photoScroll addSubview:imageView];
78-
}
79-
self.photoNum = 0;
80-
// self.photoPageControl.defersCurrentPageDisplay = YES;
81-
[self layoutScrollImages]; // now place the photos in serial layout within the scrollview
58+
[photoScroll setContentSize:CGSizeMake(320,2600)];
59+
60+
// [photoScroll setFrame:CGRectMake(0, 44, 320, 367)];
61+
// [photoScroll setBackgroundColor:[UIColor blackColor]];
62+
// [photoScroll setCanCancelContentTouches:NO];
63+
// [photoScroll setDelegate:self];
64+
// photoScroll.indicatorStyle = UIScrollViewIndicatorStyleWhite;
65+
// photoScroll.clipsToBounds = YES;
66+
// photoScroll.scrollEnabled = YES;
67+
// photoScroll.pagingEnabled = YES;
68+
// photoScroll.showsHorizontalScrollIndicator = NO;
69+
// for (int i = 1; i <= kNumImages; i++)
70+
// {
71+
// NSString *imageName = [NSString stringWithFormat:@"image%d.jpg", i];
72+
// UIImage *image = [UIImage imageNamed:imageName];
73+
// UIImageView *imageView = [[UIImageView alloc] initWithImage:image];
74+
//
75+
// CGRect rect = imageView.frame;
76+
// rect.size.height = kScrollObjHeight;
77+
// rect.size.width = kScrollObjWidth;
78+
// imageView.frame = rect;
79+
// imageView.tag = i;
80+
// [photoScroll addSubview:imageView];
81+
// }
82+
// self.photoNum = 0;
83+
//// self.photoPageControl.defersCurrentPageDisplay = YES;
84+
// [self layoutScrollImages]; // now place the photos in serial layout within the scrollview
8285
}
8386

8487

@@ -95,13 +98,13 @@ - (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView
9598
self.photoNum = 3;
9699
else self.photoNum = 4;
97100

98-
photoPageControl.currentPage = self.photoNum;
101+
// photoPageControl.currentPage = self.photoNum;
99102
}
100103

101104
- (void)viewDidUnload
102105
{
103106
[self setPhotoScroll:nil];
104-
[self setPhotoPageControl:nil];
107+
// [self setPhotoPageControl:nil];
105108
[super viewDidUnload];
106109
// Release any retained subviews of the main view.
107110
// e.g. self.myOutlet = nil;

0 commit comments

Comments
 (0)