Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixing small issues and working on the about tab.

  • Loading branch information...
commit 4a1a8dd418d7579eb61aae2659780778c7fddfc5 1 parent f12fa30
Sam Corder authored June 27, 2012
24  BluesFest.xcodeproj/project.pbxproj
@@ -7,6 +7,10 @@
7 7
 	objects = {
8 8
 
9 9
 /* Begin PBXBuildFile section */
  10
+		090C709E159AAC21009A080B /* CBFSlideTickerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 090C709D159AAC21009A080B /* CBFSlideTickerView.m */; };
  11
+		090C70A1159AB6EC009A080B /* credits.plist in Resources */ = {isa = PBXBuildFile; fileRef = 090C70A0159AB6EC009A080B /* credits.plist */; };
  12
+		090C70A4159ABDC1009A080B /* cincybluesfestlogo.png in Resources */ = {isa = PBXBuildFile; fileRef = 090C70A2159ABDC1009A080B /* cincybluesfestlogo.png */; };
  13
+		090C70A5159ABDC1009A080B /* cincybluesfestlogo@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 090C70A3159ABDC1009A080B /* cincybluesfestlogo@2x.png */; };
10 14
 		091BA3CA1559B05B00C94F95 /* CBFShowMapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 091BA3C91559B05B00C94F95 /* CBFShowMapViewController.m */; };
11 15
 		091BA3CB1559B05B00C94F95 /* CBFShowMapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 091BA3C91559B05B00C94F95 /* CBFShowMapViewController.m */; };
12 16
 		091BA3CF1559B57500C94F95 /* CoreDataTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 091BA3CE1559B57500C94F95 /* CoreDataTableViewController.m */; };
@@ -19,8 +23,6 @@
19 23
 		092860F0156364C500060F4C /* CBFShowActionSheetDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 092860EE156364C500060F4C /* CBFShowActionSheetDelegate.m */; };
20 24
 		092860F4156600F600060F4C /* starc@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 092860F2156600F500060F4C /* starc@2x.png */; };
21 25
 		092860F5156600F600060F4C /* starc@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 092860F2156600F500060F4C /* starc@2x.png */; };
22  
-		09286110156601B700060F4C /* cincybluesfestappicon.png in Resources */ = {isa = PBXBuildFile; fileRef = 092860F9156601B700060F4C /* cincybluesfestappicon.png */; };
23  
-		09286111156601B700060F4C /* cincybluesfestappicon.png in Resources */ = {isa = PBXBuildFile; fileRef = 092860F9156601B700060F4C /* cincybluesfestappicon.png */; };
24 26
 		0928611E156601B700060F4C /* show-large-default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 09286100156601B700060F4C /* show-large-default@2x.png */; };
25 27
 		09286121156601B700060F4C /* show-small-default.png in Resources */ = {isa = PBXBuildFile; fileRef = 09286101156601B700060F4C /* show-small-default.png */; };
26 28
 		09286122156601B700060F4C /* show-small-default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 09286102156601B700060F4C /* show-small-default@2x.png */; };
@@ -252,6 +254,11 @@
252 254
 /* End PBXBuildFile section */
253 255
 
254 256
 /* Begin PBXFileReference section */
  257
+		090C709C159AAC21009A080B /* CBFSlideTickerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CBFSlideTickerView.h; sourceTree = "<group>"; };
  258
+		090C709D159AAC21009A080B /* CBFSlideTickerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CBFSlideTickerView.m; sourceTree = "<group>"; };
  259
+		090C70A0159AB6EC009A080B /* credits.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = credits.plist; sourceTree = "<group>"; };
  260
+		090C70A2159ABDC1009A080B /* cincybluesfestlogo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = cincybluesfestlogo.png; path = Resources/cincybluesfestlogo.png; sourceTree = "<group>"; };
  261
+		090C70A3159ABDC1009A080B /* cincybluesfestlogo@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "cincybluesfestlogo@2x.png"; path = "Resources/cincybluesfestlogo@2x.png"; sourceTree = "<group>"; };
255 262
 		091BA3C81559B05B00C94F95 /* CBFShowMapViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CBFShowMapViewController.h; sourceTree = "<group>"; };
256 263
 		091BA3C91559B05B00C94F95 /* CBFShowMapViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CBFShowMapViewController.m; sourceTree = "<group>"; };
257 264
 		091BA3CD1559B57500C94F95 /* CoreDataTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreDataTableViewController.h; sourceTree = "<group>"; };
@@ -261,7 +268,6 @@
261 268
 		092860ED156364C400060F4C /* CBFShowActionSheetDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CBFShowActionSheetDelegate.h; sourceTree = "<group>"; };
262 269
 		092860EE156364C500060F4C /* CBFShowActionSheetDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CBFShowActionSheetDelegate.m; sourceTree = "<group>"; };
263 270
 		092860F2156600F500060F4C /* starc@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "starc@2x.png"; path = "Resources/starc@2x.png"; sourceTree = "<group>"; };
264  
-		092860F9156601B700060F4C /* cincybluesfestappicon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = cincybluesfestappicon.png; path = Resources/cincybluesfestappicon.png; sourceTree = "<group>"; };
265 271
 		092860FF156601B700060F4C /* show-large-default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "show-large-default.png"; path = "Resources/show-large-default.png"; sourceTree = "<group>"; };
266 272
 		09286100156601B700060F4C /* show-large-default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "show-large-default@2x.png"; path = "Resources/show-large-default@2x.png"; sourceTree = "<group>"; };
267 273
 		09286101156601B700060F4C /* show-small-default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "show-small-default.png"; path = "Resources/show-small-default.png"; sourceTree = "<group>"; };
@@ -659,7 +665,8 @@
659 665
 				09BC037E1597911500E4D7DA /* fire.png */,
660 666
 				09F58D061569FF6F001AD487 /* magnify.png */,
661 667
 				09F58D071569FF6F001AD487 /* magnify@2x.png */,
662  
-				092860F9156601B700060F4C /* cincybluesfestappicon.png */,
  668
+				090C70A2159ABDC1009A080B /* cincybluesfestlogo.png */,
  669
+				090C70A3159ABDC1009A080B /* cincybluesfestlogo@2x.png */,
663 670
 				092860FF156601B700060F4C /* show-large-default.png */,
664 671
 				09286100156601B700060F4C /* show-large-default@2x.png */,
665 672
 				09286101156601B700060F4C /* show-small-default.png */,
@@ -694,6 +701,7 @@
694 701
 				09FCFEA315981FD5005F0031 /* applaunch.png */,
695 702
 				09FCFEA115981F20005F0031 /* applaunch@2x.png */,
696 703
 				0960F58C1552C9D80083C9C8 /* BluesFest.plist */,
  704
+				090C70A0159AB6EC009A080B /* credits.plist */,
697 705
 			);
698 706
 			name = Resources;
699 707
 			path = ..;
@@ -718,6 +726,8 @@
718 726
 				09A117E2155D891D0028B08E /* UIImage+Alpha.m */,
719 727
 				094BD598157D945100BEBA13 /* CBFFlipSegue.h */,
720 728
 				094BD599157D945100BEBA13 /* CBFFlipSegue.m */,
  729
+				090C709C159AAC21009A080B /* CBFSlideTickerView.h */,
  730
+				090C709D159AAC21009A080B /* CBFSlideTickerView.m */,
721 731
 			);
722 732
 			name = Views;
723 733
 			sourceTree = "<group>";
@@ -978,7 +988,6 @@
978 988
 				091BA3D9155A229500C94F95 /* maptabbar@2x.png in Resources */,
979 989
 				09A117CB155B68BA0028B08E /* ImageData.plist in Resources */,
980 990
 				092860F4156600F600060F4C /* starc@2x.png in Resources */,
981  
-				09286110156601B700060F4C /* cincybluesfestappicon.png in Resources */,
982 991
 				0928611E156601B700060F4C /* show-large-default@2x.png in Resources */,
983 992
 				09286122156601B700060F4C /* show-small-default@2x.png in Resources */,
984 993
 				09286124156601B700060F4C /* show-tabbar@2x.png in Resources */,
@@ -1092,6 +1101,9 @@
1092 1101
 				09BC03901597B9BF00E4D7DA /* appicon@2x.png in Resources */,
1093 1102
 				09FCFEA215981F20005F0031 /* applaunch@2x.png in Resources */,
1094 1103
 				09FCFEA415981FD5005F0031 /* applaunch.png in Resources */,
  1104
+				090C70A1159AB6EC009A080B /* credits.plist in Resources */,
  1105
+				090C70A4159ABDC1009A080B /* cincybluesfestlogo.png in Resources */,
  1106
+				090C70A5159ABDC1009A080B /* cincybluesfestlogo@2x.png in Resources */,
1095 1107
 			);
1096 1108
 			runOnlyForDeploymentPostprocessing = 0;
1097 1109
 		};
@@ -1105,7 +1117,6 @@
1105 1117
 				091BA3DA155A229500C94F95 /* maptabbar@2x.png in Resources */,
1106 1118
 				09A117CC155B68BA0028B08E /* ImageData.plist in Resources */,
1107 1119
 				092860F5156600F600060F4C /* starc@2x.png in Resources */,
1108  
-				09286111156601B700060F4C /* cincybluesfestappicon.png in Resources */,
1109 1120
 				09286121156601B700060F4C /* show-small-default.png in Resources */,
1110 1121
 				09286123156601B700060F4C /* show-small-default@2x.png in Resources */,
1111 1122
 				09286125156601B700060F4C /* show-tabbar@2x.png in Resources */,
@@ -1169,6 +1180,7 @@
1169 1180
 				094BD59D157F101E00BEBA13 /* CBFAppearance.m in Sources */,
1170 1181
 				09EFC022159784DE004451A8 /* CBFAppreciationViewController.m in Sources */,
1171 1182
 				09EFC02515978593004451A8 /* CBFAboutViewController.m in Sources */,
  1183
+				090C709E159AAC21009A080B /* CBFSlideTickerView.m in Sources */,
1172 1184
 			);
1173 1185
 			runOnlyForDeploymentPostprocessing = 0;
1174 1186
 		};
4  BluesFest/CBFAboutViewController.h
@@ -10,4 +10,8 @@
10 10
 
11 11
 @interface CBFAboutViewController : UIViewController
12 12
 
  13
+@property (weak, nonatomic) IBOutlet UILabel *templateLabel;
  14
+
  15
+- (void)scrollCredits:(NSTimer*)theTimer;
  16
+
13 17
 @end
80  BluesFest/CBFAboutViewController.m
@@ -9,32 +9,96 @@
9 9
 #import "CBFAboutViewController.h"
10 10
 
11 11
 @interface CBFAboutViewController ()
  12
+{
  13
+    NSMutableArray *credits;
  14
+    int creditsIdx;
  15
+    NSArray *creditViews;
  16
+    int curCreditViewIdx;
  17
+    int nextCredViewIdx;
  18
+    NSTimer *creditTimer;
  19
+    CGRect creditBounds;
  20
+    CGRect creditOffBounds;
  21
+    CGRect creditStartBounds;
  22
+}
12 23
 
13 24
 @end
14 25
 
15 26
 @implementation CBFAboutViewController
  27
+@synthesize templateLabel;
16 28
 
17  
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
  29
+- (void)viewDidLoad
18 30
 {
19  
-    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
20  
-    if (self) {
21  
-        // Custom initialization
  31
+    [super viewDidLoad];
  32
+    
  33
+    NSString *path = [[NSBundle mainBundle] pathForResource:
  34
+                      @"credits" ofType:@"plist"];
  35
+    credits = [[NSMutableArray alloc] initWithContentsOfFile:path];
  36
+
  37
+    
  38
+    creditViews = [NSArray arrayWithObjects:[[UILabel alloc]init], [[UILabel alloc]init], nil];
  39
+    float width = 260;
  40
+    float y = self.templateLabel.frame.origin.y + self.templateLabel.frame.size.height + 5;
  41
+    float height = 21;
  42
+    creditBounds = CGRectMake((self.view.bounds.size.width - width) / 2, y, width, height);
  43
+    creditStartBounds = CGRectMake(-width, y, width, height);
  44
+    
  45
+    creditOffBounds = CGRectMake(self.view.bounds.size.width + width, y, width, height);
  46
+    for (UILabel *view in creditViews) {
  47
+        view.frame = creditStartBounds;
  48
+        view.backgroundColor = self.templateLabel.backgroundColor;
  49
+        view.textColor = self.templateLabel.textColor;
  50
+        view.font = self.templateLabel.font;
  51
+        view.textAlignment = self.templateLabel.textAlignment;
  52
+        [self.view addSubview:view];
22 53
     }
23  
-    return self;
  54
+    UILabel *current = (UILabel *) [creditViews objectAtIndex:curCreditViewIdx];
  55
+    current.frame = creditBounds;
  56
+    current.text = [credits objectAtIndex:creditsIdx];
  57
+    creditsIdx++;
  58
+    nextCredViewIdx = 1;
  59
+
24 60
 }
25 61
 
26  
-- (void)viewDidLoad
  62
+- (void)viewWillAppear:(BOOL)animated
27 63
 {
28  
-    [super viewDidLoad];
29  
-	// Do any additional setup after loading the view.
  64
+    creditTimer = [NSTimer timerWithTimeInterval:3 target:self selector:@selector(scrollCredits:) userInfo:nil repeats:YES];
  65
+    [[NSRunLoop currentRunLoop] addTimer:creditTimer forMode:NSRunLoopCommonModes];
  66
+    //[self scrollCredits:creditTimer];
  67
+}
  68
+
  69
+- (void)viewWillDisappear:(BOOL)animated
  70
+{
  71
+    [creditTimer invalidate];
30 72
 }
31 73
 
32 74
 - (void)viewDidUnload
33 75
 {
  76
+    [self setTemplateLabel:nil];
34 77
     [super viewDidUnload];
35 78
     // Release any retained subviews of the main view.
36 79
 }
37 80
 
  81
+- (void)scrollCredits:(NSTimer*)theTimer
  82
+{
  83
+    UILabel *next = [creditViews objectAtIndex:nextCredViewIdx];
  84
+    next.text = [credits objectAtIndex:creditsIdx];
  85
+    creditsIdx++;
  86
+    if(creditsIdx >= [credits count]) creditsIdx = 0;
  87
+    [UIView animateWithDuration:2 animations:^(void){
  88
+//        NSLog(@"swapping credits");
  89
+        [[creditViews objectAtIndex:curCreditViewIdx] setFrame:creditOffBounds];
  90
+        [[creditViews objectAtIndex:nextCredViewIdx] setFrame:creditBounds];
  91
+    }
  92
+    completion:^(BOOL finished) {
  93
+        int swap = curCreditViewIdx;
  94
+        curCreditViewIdx = nextCredViewIdx;
  95
+        nextCredViewIdx = swap;
  96
+        [[creditViews objectAtIndex:nextCredViewIdx] setFrame:creditStartBounds];
  97
+    }];
  98
+    
  99
+    
  100
+}
  101
+
38 102
 - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
39 103
 {
40 104
     return (interfaceOrientation == UIInterfaceOrientationPortrait);
2  BluesFest/CBFCurvedAnimator.h
@@ -13,7 +13,7 @@
13 13
 @property(strong,nonatomic) UIView *toView;
14 14
 @property(strong,nonatomic) UIView *fromView;
15 15
 
16  
--(CBFCurvedAnimator *)initWithTargets:(UIView *)to: (UIView *)from;
  16
+-(CBFCurvedAnimator *)initWithTargets:(UIView *)to animateFrom:(UIView *)from;
17 17
 -(void)animateToBottomLeftWithOffset: (NSInteger)offset;
18 18
 -(void)animateFromBottomLeftWithOffset: (NSInteger)offset;
19 19
 
8  BluesFest/CBFCurvedAnimator.m
@@ -9,13 +9,14 @@
9 9
 #import "CBFCurvedAnimator.h"
10 10
 
11 11
 #import <QuartzCore/QuartzCore.h>
  12
+#import <QuartzCore/CoreAnimation.h>
12 13
 
13 14
 @implementation CBFCurvedAnimator
14 15
 
15 16
 @synthesize toView = _toView;
16 17
 @synthesize fromView = _fromView;
17 18
 
18  
--(CBFCurvedAnimator *) initWithTargets:(UIView *)to :(UIView *)from
  19
+-(CBFCurvedAnimator *) initWithTargets:(UIView *)to animateFrom:(UIView *)from
19 20
 {
20 21
     self.toView = to;
21 22
     self.fromView = from;
@@ -57,10 +58,13 @@ -(void)animateToBottomLeftWithOffset: (NSInteger)offset
57 58
     CAAnimationGroup *animGroup = [CAAnimationGroup animation];
58 59
     animGroup.animations = [NSArray arrayWithObjects:moveAnim, scaleAnim, opacityAnim, nil];
59 60
     animGroup.duration = 0.5;
  61
+
60 62
     [animTarget.layer addAnimation:animGroup forKey:nil];
61  
-    
  63
+
62 64
 }
63 65
 
  66
+
  67
+
64 68
 -(void)animateFromBottomLeftWithOffset: (NSInteger)offset
65 69
 {
66 70
     UIView *toView = self.toView;
12  BluesFest/CBFShowDetailViewController.m
@@ -200,17 +200,21 @@ - (IBAction)actionSelected:(id)sender {
200 200
 }
201 201
 
202 202
 - (IBAction)toggleOnAgenda:(id)sender {
203  
-    CBFCurvedAnimator *cva = [[CBFCurvedAnimator alloc] initWithTargets:self.view :self.bandImage];
204  
-    
  203
+//    UIImageView *bandAnimated = [[UIImageView alloc]initWithImage:self.bandImage.image];
  204
+//    bandAnimated.frame = self.bandImage.frame;
  205
+//    [self.view addSubview:bandAnimated];
  206
+//    CBFCurvedAnimator *cva = [[CBFCurvedAnimator alloc] initWithTargets:self.view animateFrom:self.bandImage];
  207
+    [self.view bringSubviewToFront:self.bandImage];
  208
+
205 209
     if([self.show.favorite intValue] == 0){
206 210
         NSLog(@"Adding to favorites");
207 211
         self.show.favorite = [NSNumber numberWithInt:1];
208  
-        [cva animateToBottomLeftWithOffset:40];
  212
+//        [cva animateToBottomLeftWithOffset:40];
209 213
         [self.btnFavorites setTitle: @"Remove Favorite" forState: UIControlStateNormal];
210 214
     }else{
211 215
         NSLog(@"Removing from favorites.");
212 216
         self.show.favorite = [NSNumber numberWithInt:0];
213  
-        [cva animateFromBottomLeftWithOffset:0];
  217
+//        [cva animateFromBottomLeftWithOffset:0];
214 218
         [self.btnFavorites setTitle: @"Add to Favorites" forState: UIControlStateNormal];
215 219
     }
216 220
     
13  BluesFest/CBFSlideTickerView.h
... ...
@@ -0,0 +1,13 @@
  1
+//
  2
+//  CBFSlideTickerView.h
  3
+//  BluesFest
  4
+//
  5
+//  Created by Samuel Corder on 6/26/12.
  6
+//
  7
+//
  8
+
  9
+#import <UIKit/UIKit.h>
  10
+
  11
+@interface CBFSlideTickerView : UIView
  12
+
  13
+@end
31  BluesFest/CBFSlideTickerView.m
... ...
@@ -0,0 +1,31 @@
  1
+//
  2
+//  CBFSlideTickerView.m
  3
+//  BluesFest
  4
+//
  5
+//  Created by Samuel Corder on 6/26/12.
  6
+//
  7
+//
  8
+
  9
+#import "CBFSlideTickerView.h"
  10
+
  11
+@implementation CBFSlideTickerView
  12
+
  13
+- (id)initWithFrame:(CGRect)frame
  14
+{
  15
+    self = [super initWithFrame:frame];
  16
+    if (self) {
  17
+        // Initialization code
  18
+    }
  19
+    return self;
  20
+}
  21
+
  22
+/*
  23
+// Only override drawRect: if you perform custom drawing.
  24
+// An empty implementation adversely affects performance during animation.
  25
+- (void)drawRect:(CGRect)rect
  26
+{
  27
+    // Drawing code
  28
+}
  29
+*/
  30
+
  31
+@end
46  BluesFest/main-iphone.storyboard
... ...
@@ -1,5 +1,5 @@
1 1
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
2  
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="1.1" toolsVersion="2507" systemVersion="12A248" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="miP-7c-sN3">
  2
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="1.1" toolsVersion="2507" systemVersion="12A256" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="miP-7c-sN3">
3 3
     <dependencies>
4 4
         <deployment defaultVersion="1296" identifier="iOS"/>
5 5
         <development defaultVersion="4200" identifier="xcode"/>
@@ -155,9 +155,47 @@
155 155
                     <view key="view" contentMode="scaleToFill" id="VJ3-AP-gBR">
156 156
                         <rect key="frame" x="0.0" y="20" width="320" height="411"/>
157 157
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
158  
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
  158
+                        <subviews>
  159
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Created By: Sam Corder (sam.corder@gmail.com)" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" minimumFontSize="10" id="x2X-7m-iwe">
  160
+                                <rect key="frame" x="20" y="345" width="200" height="66"/>
  161
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  162
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
  163
+                                <color key="textColor" cocoaTouchSystemColor="lightTextColor"/>
  164
+                                <nil key="highlightedColor"/>
  165
+                            </label>
  166
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="The festival is run by:" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="c1H-1C-PuF">
  167
+                                <rect key="frame" x="45" y="98" width="233" height="21"/>
  168
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  169
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
  170
+                                <color key="textColor" cocoaTouchSystemColor="lightTextColor"/>
  171
+                                <nil key="highlightedColor"/>
  172
+                            </label>
  173
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Sponsored By:" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="eSW-p7-YDG">
  174
+                                <rect key="frame" x="45" y="147" width="233" height="21"/>
  175
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  176
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
  177
+                                <color key="textColor" cocoaTouchSystemColor="lightTextColor"/>
  178
+                                <nil key="highlightedColor"/>
  179
+                            </label>
  180
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" lineBreakMode="wordWrap" numberOfLines="0" minimumFontSize="10" id="TDa-uj-CcA">
  181
+                                <rect key="frame" x="19" y="267" width="280" height="88"/>
  182
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  183
+                                <string key="text">They Cincy Blues Society would like to thank its sponsors and all of its volunteers without which this event would not be possible.</string>
  184
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
  185
+                                <color key="textColor" cocoaTouchSystemColor="lightTextColor"/>
  186
+                                <nil key="highlightedColor"/>
  187
+                            </label>
  188
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="cincybluesfestlogo.png" id="TlF-0Z-AaT">
  189
+                                <rect key="frame" x="63" y="10" width="193" height="80"/>
  190
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  191
+                            </imageView>
  192
+                        </subviews>
  193
+                        <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
159 194
                     </view>
160 195
                     <tabBarItem key="tabBarItem" title="About" image="abouttabbar.png" id="PN4-gR-fdN"/>
  196
+                    <connections>
  197
+                        <outlet property="templateLabel" destination="c1H-1C-PuF" id="6c9-w8-K5S"/>
  198
+                    </connections>
161 199
                 </viewController>
162 200
             </objects>
163 201
             <point key="canvasLocation" x="-395" y="1464"/>
@@ -512,6 +550,7 @@
512 550
     </scenes>
513 551
     <resources>
514 552
         <image name="abouttabbar.png" width="30" height="30"/>
  553
+        <image name="cincybluesfestlogo.png" width="193" height="80"/>
515 554
         <image name="firetabbar.png" width="30" height="30"/>
516 555
         <image name="magnify.png" width="44" height="44"/>
517 556
         <image name="maptabbar.png" width="30" height="30"/>
@@ -524,6 +563,9 @@
524 563
     <classes>
525 564
         <class className="CBFAboutViewController" superclassName="UIViewController">
526 565
             <source key="sourceIdentifier" type="project" relativePath="./Classes/CBFAboutViewController.h"/>
  566
+            <relationships>
  567
+                <relationship kind="outlet" name="templateLabel" candidateClass="UILabel"/>
  568
+            </relationships>
527 569
         </class>
528 570
         <class className="CBFAgendaTableViewController" superclassName="CoreDataTableViewController">
529 571
             <source key="sourceIdentifier" type="project" relativePath="./Classes/CBFAgendaTableViewController.h"/>
10  Resources/appicon.svg
@@ -17,9 +17,9 @@
17 17
    version="1.1"
18 18
    inkscape:version="0.48.3.1 r9886"
19 19
    sodipodi:docname="appicon.svg"
20  
-   inkscape:export-filename="/media/psf/Home/git/CincyBluesFest-ios/Resources/appicon@2x.png"
21  
-   inkscape:export-xdpi="10.02"
22  
-   inkscape:export-ydpi="10.02">
  20
+   inkscape:export-filename="cr++;if(cr;.png"
  21
+   inkscape:export-xdpi="0.087890625"
  22
+   inkscape:export-ydpi="0.087890625">
23 23
   <defs
24 24
      id="defs4944">
25 25
     <pattern
@@ -74,8 +74,8 @@
74 74
      borderopacity="1.0"
75 75
      inkscape:pageopacity="0"
76 76
      inkscape:pageshadow="2"
77  
-     inkscape:zoom="0.35"
78  
-     inkscape:cx="71.678571"
  77
+     inkscape:zoom="0.49497475"
  78
+     inkscape:cx="1194.6511"
79 79
      inkscape:cy="19.203977"
80 80
      inkscape:document-units="px"
81 81
      inkscape:current-layer="layer1"
BIN  Resources/cincybluesfestappicon.png
61  Resources/cincybluesfestappicon.svg
16 additions, 45 deletions not shown
BIN  Resources/cincybluesfestlogo.png
BIN  Resources/cincybluesfestlogo@2x.png
12  credits.plist
... ...
@@ -0,0 +1,12 @@
  1
+<?xml version="1.0" encoding="UTF-8"?>
  2
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
  3
+<plist version="1.0">
  4
+<array>
  5
+	<string>Mike Wayne - Festival Chairmain</string>
  6
+	<string>Michelle King - Volunteers</string>
  7
+	<string>Morgan Cobb - Marketing</string>
  8
+	<string>James Czar - Society President</string>
  9
+	<string>Dave Parker - Society VP</string>
  10
+	<string>Dilip Tripathy - Society Treasurer</string>
  11
+</array>
  12
+</plist>

0 notes on commit 4a1a8dd

Please sign in to comment.
Something went wrong with that request. Please try again.