-
Notifications
You must be signed in to change notification settings - Fork 2
/
Copy pathBuildDetailView.m.orig
62 lines (50 loc) · 1.92 KB
/
BuildDetailView.m.orig
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
//
// Created by mike_rowe on 27/10/11.
//
// To change the template use AppCode | Preferences | File Templates.
//
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
#import "BuildDetailView.h"
@implementation BuildDetailView
- (id)initWithFrame:(CGRect)frame build:(Build *)build;
{
<<<<<<< HEAD
if ((self = [super initWithFrame:frame]))
{
UILabel *build_name = [[UILabel alloc] initWithFrame:CGRectMake(0., 10., 50., 40.)];
[build_name setTextAlignment:UITextAlignmentCenter];
[build_name setFont:[UIFont boldSystemFontOfSize:22.]];
[build_name setBackgroundColor:[UIColor clearColor]];
[build_name setText:[build name]];
[self addSubview:build_name];
UILabel *build_status = [[UILabel alloc] initWithFrame:CGRectMake(0., 50., 50., 40.)];
[build_status setTextAlignment:UITextAlignmentCenter];
[build_status setText:[NSString stringWithFormat:@"Status: %@", [build status]]];
[build_status setBackgroundColor:[UIColor clearColor]];
[self addSubview:build_status];
[self setBackgroundColor:[UIColor colorWithPatternImage:[UIImage imageNamed:@"Background.png"]]];
}
return self;
}
#pragma mark - UIView Lifecycle
- (void)drawRect:(CGRect)rect;
{
}
=======
if ((self = [super initWithFrame:frame])) {
[self setBackgroundColor:[UIColor whiteColor]];
UILabel *build_name = [[UILabel alloc] initWithFrame:CGRectMake(0., 10., CGRectGetMaxX(frame), 40.)];
[build_name setTextAlignment:UITextAlignmentCenter];
[build_name setFont:[UIFont boldSystemFontOfSize:22.]];
[build_name setText:[build name]];
[self addSubview:build_name];
>>>>>>> origin/master
UILabel *build_status = [[UILabel alloc] initWithFrame:CGRectMake(0., 50., CGRectGetMaxX(frame), 40.)];
[build_status setTextAlignment:UITextAlignmentCenter];
[build_status setText:[NSString stringWithFormat:@"Status: %@", [build status]]];
[self addSubview:build_status];
}
return self;
}
@end