diff --git a/Classes/BuschJaegerHistoryDetailsView.xib b/Classes/BuschJaegerHistoryDetailsView.xib index b969da520..b56209426 100644 --- a/Classes/BuschJaegerHistoryDetailsView.xib +++ b/Classes/BuschJaegerHistoryDetailsView.xib @@ -2,13 +2,13 @@ 1536 - 11G63 - 2840 - 1138.51 - 569.00 + 12C60 + 2843 + 1187.34 + 625.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 1929 IBProxyObject @@ -44,7 +44,6 @@ 274 {{0, 34}, {320, 368}} - _NS:10 @@ -67,7 +66,6 @@ 292 {{5, 5}, {152, 21}} - _NS:9 NO @@ -95,7 +93,6 @@ 289 {{168, 5}, {112, 21}} - _NS:9 NO @@ -123,7 +120,6 @@ 289 {{286, 0}, {34, 34}} - _NS:9 NO @@ -162,7 +158,6 @@ 274 {280, 40} - _NS:9 NO @@ -191,7 +186,6 @@ 274 {280, 40} - _NS:9 3 @@ -210,7 +204,6 @@ {{20, 410}, {280, 40}} - _NS:9 @@ -225,7 +218,6 @@ 274 {320, 460} - _NS:9 @@ -242,7 +234,6 @@ 265 {{266, 406}, {34, 34}} - _NS:9 NO @@ -265,7 +256,6 @@ {320, 460} - _NS:9 @@ -280,7 +270,6 @@ {{0, 20}, {320, 460}} - @@ -538,104 +527,7 @@ 41 - - - - BuschJaegerHistoryDetailsView - UIViewController - - id - id - id - id - - - - hideImage: - id - - - onBackClick: - id - - - onDeleteClick: - id - - - saveImage: - id - - - - UIView - UILabel - UISwipeGestureRecognizer - UISwipeGestureRecognizer - UITapGestureRecognizer - UIView - UIRemoteImageView - UIButton - UILabel - UITableViewController - - - - backButton - UIView - - - dateLabel - UILabel - - - detailsLeftSwipeGestureRecognizer - UISwipeGestureRecognizer - - - detailsRightSwipeGestureRecognizer - UISwipeGestureRecognizer - - - detailsTapGestureRecognizer - UITapGestureRecognizer - - - fullscreenView - UIView - - - imageView - UIRemoteImageView - - - saveButton - UIButton - - - stationLabel - UILabel - - - tableController - UITableViewController - - - - IBProjectSource - ./Classes/BuschJaegerHistoryDetailsView.h - - - - UIRemoteImageView - UIImageView - - IBProjectSource - ./Classes/UIRemoteImageView.h - - - - + 0 IBCocoaTouchFramework @@ -648,6 +540,6 @@ {34, 35} {26, 26} - 1926 + 1929 diff --git a/Classes/BuschJaegerWelcomeView.xib b/Classes/BuschJaegerWelcomeView.xib index 87bb9d03c..8b5618ebd 100644 --- a/Classes/BuschJaegerWelcomeView.xib +++ b/Classes/BuschJaegerWelcomeView.xib @@ -1,14 +1,14 @@ - 1296 - 11E53 - 2549 - 1138.47 - 569.00 + 1536 + 12C60 + 2843 + 1187.34 + 625.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1929 IBProxyObject @@ -43,7 +43,6 @@ 293 {{82, 17}, {156, 50}} - _NS:9 NO @@ -78,7 +77,6 @@ 289 {{246, 10}, {64, 64}} - _NS:9 NO @@ -120,7 +118,6 @@ 292 {{10, 10}, {64, 64}} - _NS:9 NO @@ -149,7 +146,6 @@ 274 {{0, 85}, {320, 375}} - _NS:9 YES @@ -165,7 +161,6 @@ {{0, 20}, {320, 460}} - 3 @@ -340,64 +335,12 @@ 20 - - - - BuschJaegerStationTableViewController - UITableViewController - - IBProjectSource - ./Classes/BuschJaegerStationTableViewController.h - - - - BuschJaegerWelcomeView - UIViewController - - id - id - - - - historyClick: - id - - - settingsClick: - id - - - - UIButton - UIButton - BuschJaegerStationTableViewController - - - - historyButton - UIButton - - - settingsButton - UIButton - - - tableController - BuschJaegerStationTableViewController - - - - IBProjectSource - ./Classes/BuschJaegerWelcomeView.h - - - - + 0 IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -405,6 +348,6 @@ {55, 43} {55, 57} - 1498 + 1929 diff --git a/Classes/LinphoneUI/UIStationCell.h b/Classes/LinphoneUI/UIStationCell.h index 61ffebbf5..01cdd6171 100644 --- a/Classes/LinphoneUI/UIStationCell.h +++ b/Classes/LinphoneUI/UIStationCell.h @@ -27,6 +27,7 @@ @property (nonatomic, retain) IBOutlet UIImageView *stationImage; @property (nonatomic, retain) IBOutlet UILabel *stationLabel; +@property (retain, nonatomic) IBOutlet UIView *cellBackgroundView; - (id)initWithIdentifier:(NSString*)identifier; diff --git a/Classes/LinphoneUI/UIStationCell.m b/Classes/LinphoneUI/UIStationCell.m index 729800ab4..53f326261 100644 --- a/Classes/LinphoneUI/UIStationCell.m +++ b/Classes/LinphoneUI/UIStationCell.m @@ -19,11 +19,14 @@ #import "UIStationCell.h" +#import + @implementation UIStationCell @synthesize stationImage; @synthesize stationLabel; @synthesize station; +@synthesize cellBackgroundView; #pragma mark - Lifecycle Functions @@ -36,6 +39,35 @@ if ([arrayOfViews count] >= 1) { [self addSubview:[[arrayOfViews objectAtIndex:0] retain]]; } + + CALayer *layer = cellBackgroundView.layer; + layer.cornerRadius = 8.0f; + layer.masksToBounds = YES; + layer.borderWidth = 1.0f; + layer.borderColor = [UIColor colorWithWhite:0.5f alpha:0.2f].CGColor; + + CAGradientLayer *overlayButtonShineLayer; + + overlayButtonShineLayer = [CAGradientLayer layer]; + overlayButtonShineLayer.frame = layer.bounds; + overlayButtonShineLayer.colors = [NSArray arrayWithObjects: + (id)[UIColor colorWithWhite:1.0f + alpha:1.0].CGColor, + (id)[UIColor colorWithWhite:1.0f + alpha:1.0f].CGColor, + (id)[UIColor colorWithRed:0.0f green:0.0f blue:0.5f + alpha:0.8f].CGColor, + (id)[UIColor colorWithRed:0.0f green:0.0f blue:0.2f + alpha:0.8f].CGColor, + nil]; + overlayButtonShineLayer.locations = [NSArray arrayWithObjects: + [NSNumber numberWithFloat:0.0f], + [NSNumber numberWithFloat:0.1f], + [NSNumber numberWithFloat:0.101f], + [NSNumber numberWithFloat:1.0f], + nil]; + [layer addSublayer:overlayButtonShineLayer]; + } return self; } @@ -45,6 +77,7 @@ [stationImage release]; [stationLabel release]; + [cellBackgroundView release]; [super dealloc]; } diff --git a/Classes/LinphoneUI/UIStationCell.xib b/Classes/LinphoneUI/UIStationCell.xib index 3ac9f0e27..1dc1d0af5 100644 --- a/Classes/LinphoneUI/UIStationCell.xib +++ b/Classes/LinphoneUI/UIStationCell.xib @@ -1,14 +1,14 @@ - 1296 - 11E53 - 2549 - 1138.47 - 569.00 + 1536 + 12C60 + 2843 + 1187.34 + 625.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1929 IBProxyObject @@ -36,24 +36,31 @@ 292 - + - 274 - {{220, 10}, {80, 80}} + 292 + + {320, 100} - + _NS:9 - NO + + 3 + MQA + + 2 + + IBCocoaTouchFramework 274 - {{20, 10}, {27, 36}} + {{146, 44}, {27, 36}} - + _NS:9 NO IBCocoaTouchFramework @@ -65,10 +72,10 @@ 292 - {{55, 10}, {157, 36}} + {{20, 10}, {280, 36}} - + _NS:9 NO YES @@ -100,7 +107,7 @@ {320, 100} - + _NS:9 3 @@ -111,14 +118,6 @@ - - - stationImage - - - - 6 - stationLabel @@ -127,6 +126,22 @@ 9 + + + stationImage + + + + 11 + + + + cellBackgroundView + + + + 13 + @@ -151,24 +166,24 @@ 2 - - + + - - 3 - - - Image - Station - 5 Label - Station + + 10 + + + + 8 @@ -182,8 +197,8 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -191,7 +206,7 @@ - 9 + 13 @@ -199,11 +214,15 @@ UIStationCell UITableViewCell + UIView UIImageView UILabel - UILabel + + cellBackgroundView + UIView + stationImage UIImageView @@ -212,10 +231,6 @@ stationLabel UILabel - - stationName - UILabel - IBProjectSource @@ -226,16 +241,12 @@ 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 bj_station.png {27, 36} - 1498 + 1929