diff --git a/Classes/BuschJaegerApp.xib b/Classes/BuschJaegerApp.xib index b02023e4e..24233bc79 100644 --- a/Classes/BuschJaegerApp.xib +++ b/Classes/BuschJaegerApp.xib @@ -2,13 +2,13 @@ 1536 - 11G63 - 2840 - 1138.51 - 569.00 + 12C60 + 2844 + 1187.34 + 625.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 1930 IBProxyObject @@ -40,8 +40,6 @@ 301 {320, 480} - - _NS:9 1 @@ -164,490 +162,7 @@ 33 - - - - BuschJaegerCallView - UIViewController - - id - id - - - - onSnapshotClick: - id - - - takeCall: - id - - - - UISwipeGestureRecognizer - UISwipeGestureRecognizer - UILabel - UIHangUpButton - UIHangUpButton - UIView - UIDigitButton - UIToggleButton - UIDigitButton - UIButton - UIButton - UIView - - - - cameraLeftSwipeGestureRecognizer - UISwipeGestureRecognizer - - - cameraRightSwipeGestureRecognizer - UISwipeGestureRecognizer - - - contactLabel - UILabel - - - declineButton - UIHangUpButton - - - endOrRejectCallButton - UIHangUpButton - - - incomingView - UIView - - - lightsButton - UIDigitButton - - - microButton - UIToggleButton - - - openDoorButton - UIDigitButton - - - snapshotButton - UIButton - - - takeCallButton - UIButton - - - videoView - UIView - - - - IBProjectSource - ./Classes/BuschJaegerCallView.h - - - - 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 - - - - BuschJaegerHistoryTableViewController - UITableViewController - - waitView - UIView - - - waitView - - waitView - UIView - - - - IBProjectSource - ./Classes/BuschJaegerHistoryTableViewController.h - - - - BuschJaegerHistoryView - UIViewController - - onBackClick: - id - - - onBackClick: - - onBackClick: - id - - - - UIView - BuschJaegerHistoryTableViewController - UIView - - - - backButton - UIView - - - tableController - BuschJaegerHistoryTableViewController - - - waitView - UIView - - - - IBProjectSource - ./Classes/BuschJaegerHistoryView.h - - - - BuschJaegerMainView - UIViewController - - BuschJaegerCallView - BuschJaegerHistoryDetailsView - BuschJaegerHistoryView - BuschJaegerManualSettingsView - UINavigationControllerEx - BuschJaegerSettingsView - BuschJaegerWelcomeView - - - - callView - BuschJaegerCallView - - - historyDetailsView - BuschJaegerHistoryDetailsView - - - historyView - BuschJaegerHistoryView - - - manualSettingsView - BuschJaegerManualSettingsView - - - navigationController - UINavigationControllerEx - - - settingsView - BuschJaegerSettingsView - - - welcomeView - BuschJaegerWelcomeView - - - - IBProjectSource - ./Classes/BuschJaegerMainView.h - - - - BuschJaegerManualSettingsView - UIViewController - - UITextField - UIView - UITextField - UITextField - UIView - - - - addressField - UITextField - - - backButton - UIView - - - passwordField - UITextField - - - usernameField - UITextField - - - validButton - UIView - - - - IBProjectSource - ./Classes/BuschJaegerManualSettingsView.h - - - - BuschJaegerSettingsView - UIViewController - - id - id - id - - - - onBackClick: - id - - - onManualClick: - id - - - onScanClick: - id - - - - UIView - UIView - UIView - UIView - - - - backButton - UIView - - - manualButton - UIView - - - scanButton - UIView - - - waitView - UIView - - - - IBProjectSource - ./Classes/BuschJaegerSettingsView.h - - - - 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 - - - - LinphoneAppDelegate - NSObject - - IBProjectSource - ./Classes/LinphoneAppDelegate.h - - - - UIDigitButton - UILongTouchButton - - addressField - UITextField - - - addressField - - addressField - UITextField - - - - IBProjectSource - ./Classes/UIDigitButton.h - - - - UIHangUpButton - UIButton - - IBProjectSource - ./Classes/UIHangUpButton.h - - - - UILongTouchButton - UIButton - - IBProjectSource - ./Classes/UILongTouchButton.h - - - - UINavigationControllerEx - UINavigationController - - IBProjectSource - ./Classes/UINavigationControllerEx.h - - - - UIRemoteImageView - UIImageView - - IBProjectSource - ./Classes/UIRemoteImageView.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - + 0 IBCocoaTouchFramework @@ -656,6 +171,6 @@ YES 3 - 1926 + 1930 diff --git a/Classes/BuschJaegerCallView.m b/Classes/BuschJaegerCallView.m index c5e0585d5..f70d43ca6 100644 --- a/Classes/BuschJaegerCallView.m +++ b/Classes/BuschJaegerCallView.m @@ -23,6 +23,7 @@ #include "linphonecore.h" #import #import +#import "UIView+RoundUIView.h" @implementation BuschJaegerCallView @@ -108,6 +109,7 @@ UIColor* col1 = BUSCHJAEGER_NORMAL_COLOR; UIColor* col2 = BUSCHJAEGER_NORMAL_COLOR2; [BuschJaegerUtils createGradientForButton:microButton withTopColor:col1 bottomColor:col2]; + [microButton makeRoundWithCorner:(UIRectCornerBottomLeft|UIRectCornerTopLeft) radius:(microButton.bounds.size.height/2.0)]; } { UIColor* col1 = BUSCHJAEGER_RED_COLOR; @@ -115,12 +117,16 @@ [BuschJaegerUtils createGradientForButton:endOrRejectCallButton withTopColor:col1 bottomColor:col2]; [BuschJaegerUtils createGradientForButton:declineButton withTopColor:col1 bottomColor:col2]; + [endOrRejectCallButton makeRoundWithCorner:(UIRectCornerBottomLeft|UIRectCornerTopLeft) radius:(endOrRejectCallButton.bounds.size.height/2.0)]; + [declineButton makeRoundWithCorner:(UIRectCornerBottomLeft|UIRectCornerTopLeft) radius:(declineButton.bounds.size.height/2.0)]; + } { UIColor* col1 = BUSCHJAEGER_GREEN_COLOR; UIColor* col2 = BUSCHJAEGER_GREEN_COLOR; [BuschJaegerUtils createGradientForButton:takeCallButton withTopColor:col1 bottomColor:col2]; + [takeCallButton makeRoundWithCorner:(UIRectCornerBottomRight|UIRectCornerTopRight) radius:(takeCallButton.bounds.size.height/2.0)]; } linphone_core_set_native_video_window_id([LinphoneManager getLc], (unsigned long)videoView); diff --git a/Classes/BuschJaegerCallView.xib b/Classes/BuschJaegerCallView.xib index beffad3cf..c9345dbfc 100644 --- a/Classes/BuschJaegerCallView.xib +++ b/Classes/BuschJaegerCallView.xib @@ -2,13 +2,13 @@ 1536 - 11G63 - 2840 - 1138.51 - 569.00 + 12C60 + 2844 + 1187.34 + 625.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 1930 IBProxyObject @@ -41,7 +41,6 @@ -2147483374 {320, 480} - _NS:196 @@ -55,7 +54,6 @@ 289 {{266, 20}, {34, 34}} - _NS:9 NO @@ -97,7 +95,6 @@ 292 {73, 58} - _NS:225 @@ -122,7 +119,6 @@ -2147483356 {73, 58} - _NS:225 @@ -144,7 +140,6 @@ 292 {{207, 0}, {73, 58}} - _NS:225 @@ -171,8 +166,6 @@ -2147483356 {{207, 0}, {73, 58}} - - _NS:225 NO @@ -194,7 +187,6 @@ 292 {{73, 0}, {67, 58}} - _NS:225 @@ -221,7 +213,6 @@ 292 {{140, 0}, {67, 58}} - _NS:225 @@ -251,7 +242,6 @@ {{20, 399}, {280, 58}} - _NS:196 @@ -266,10 +256,8 @@ 274 {320, 42} - _NS:9 - NO YES 7 NO @@ -299,7 +287,6 @@ {320, 42} - _NS:9 @@ -311,7 +298,6 @@ {{0, 20}, {320, 480}} - @@ -739,6 +725,6 @@ {16, 16} {44, 34} - 1926 + 1930 diff --git a/Classes/BuschJaegerHistoryDetailsView.xib b/Classes/BuschJaegerHistoryDetailsView.xib index b56209426..784965879 100644 --- a/Classes/BuschJaegerHistoryDetailsView.xib +++ b/Classes/BuschJaegerHistoryDetailsView.xib @@ -3,12 +3,12 @@ 1536 12C60 - 2843 + 2844 1187.34 625.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1929 + 1930 IBProxyObject @@ -540,6 +540,6 @@ {34, 35} {26, 26} - 1929 + 1930 diff --git a/Classes/BuschJaegerHistoryView.xib b/Classes/BuschJaegerHistoryView.xib index a3b181684..719fe2316 100644 --- a/Classes/BuschJaegerHistoryView.xib +++ b/Classes/BuschJaegerHistoryView.xib @@ -2,13 +2,13 @@ 1536 - 11G63 - 2840 - 1138.51 - 569.00 + 12C60 + 2844 + 1187.34 + 625.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 1930 IBProxyObject @@ -48,7 +48,6 @@ 274 {280, 40} - _NS:9 NO @@ -80,7 +79,6 @@ 274 {280, 40} - _NS:9 3 @@ -109,7 +107,6 @@ {{20, 410}, {280, 40}} - _NS:9 @@ -120,7 +117,6 @@ 274 {334, 392} - _NS:9 @@ -143,7 +139,6 @@ 301 {{142, 211}, {37, 37}} - _NS:9 NO @@ -155,7 +150,6 @@ {320, 460} - _NS:9 @@ -167,11 +161,10 @@ {{0, 20}, {320, 460}} - - 3 - MAA + 1 + MC4xMTc2NDcwNTg4IDAuMTY0NzA1ODgyNCAwLjIxOTYwNzg0MzEAA IBCocoaTouchFramework @@ -361,67 +354,7 @@ 25 - - - - BuschJaegerHistoryTableViewController - UITableViewController - - waitView - UIView - - - waitView - - waitView - UIView - - - - IBProjectSource - ./Classes/BuschJaegerHistoryTableViewController.h - - - - BuschJaegerHistoryView - UIViewController - - onBackClick: - id - - - onBackClick: - - onBackClick: - id - - - - UIView - BuschJaegerHistoryTableViewController - UIView - - - - backButton - UIView - - - tableController - BuschJaegerHistoryTableViewController - - - waitView - UIView - - - - IBProjectSource - ./Classes/BuschJaegerHistoryView.h - - - - + 0 IBCocoaTouchFramework @@ -430,6 +363,6 @@ YES 3 - 1926 + 1930 diff --git a/Classes/BuschJaegerMainView.xib b/Classes/BuschJaegerMainView.xib index 152d31272..943f214a5 100644 --- a/Classes/BuschJaegerMainView.xib +++ b/Classes/BuschJaegerMainView.xib @@ -2,13 +2,13 @@ 1536 - 11G63 - 2840 - 1138.51 - 569.00 + 12C60 + 2844 + 1187.34 + 625.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 1930 IBProxyObject @@ -39,11 +39,10 @@ 301 {320, 480} - _NS:9 - 3 - MAA + 1 + MC4xNjQwNzQxMjI0IDAuMjgyMjEyMDY5MiAwLjMzMzMzMzMzMzMAA IBCocoaTouchFramework @@ -324,506 +323,7 @@ 29 - - - - BuschJaegerCallView - UIViewController - - UISwipeGestureRecognizer - id - id - - - - doCameraSwipe: - UISwipeGestureRecognizer - - - onSnapshotClick: - id - - - takeCall: - id - - - - UISwipeGestureRecognizer - UISwipeGestureRecognizer - UILabel - UIHangUpButton - UIHangUpButton - UIView - UIDigitButton - UIToggleButton - UIDigitButton - UIButton - UIButton - UIView - - - - cameraLeftSwipeGestureRecognizer - UISwipeGestureRecognizer - - - cameraRightSwipeGestureRecognizer - UISwipeGestureRecognizer - - - contactLabel - UILabel - - - declineButton - UIHangUpButton - - - endOrRejectCallButton - UIHangUpButton - - - incomingView - UIView - - - lightsButton - UIDigitButton - - - microButton - UIToggleButton - - - openDoorButton - UIDigitButton - - - snapshotButton - UIButton - - - takeCallButton - UIButton - - - videoView - UIView - - - - IBProjectSource - ./Classes/BuschJaegerCallView.h - - - - BuschJaegerHistoryDetailsView - UIViewController - - UISwipeGestureRecognizer - id - id - id - id - - - - doDetailsSwipe: - UISwipeGestureRecognizer - - - 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 - - - - BuschJaegerHistoryTableViewController - UITableViewController - - waitView - UIView - - - waitView - - waitView - UIView - - - - IBProjectSource - ./Classes/BuschJaegerHistoryTableViewController.h - - - - BuschJaegerHistoryView - UIViewController - - onBackClick: - id - - - onBackClick: - - onBackClick: - id - - - - UIView - BuschJaegerHistoryTableViewController - UIView - - - - backButton - UIView - - - tableController - BuschJaegerHistoryTableViewController - - - waitView - UIView - - - - IBProjectSource - ./Classes/BuschJaegerHistoryView.h - - - - BuschJaegerMainView - UIViewController - - BuschJaegerCallView - BuschJaegerHistoryDetailsView - BuschJaegerHistoryView - BuschJaegerManualSettingsView - UINavigationControllerEx - BuschJaegerSettingsView - BuschJaegerWelcomeView - - - - callView - BuschJaegerCallView - - - historyDetailsView - BuschJaegerHistoryDetailsView - - - historyView - BuschJaegerHistoryView - - - manualSettingsView - BuschJaegerManualSettingsView - - - navigationController - UINavigationControllerEx - - - settingsView - BuschJaegerSettingsView - - - welcomeView - BuschJaegerWelcomeView - - - - IBProjectSource - ./Classes/BuschJaegerMainView.h - - - - BuschJaegerManualSettingsView - UIViewController - - id - id - - - - onBackClick: - id - - - onValidClick: - id - - - - UITextField - UIView - UITextField - UITextField - UIView - - - - addressField - UITextField - - - backButton - UIView - - - passwordField - UITextField - - - usernameField - UITextField - - - validButton - UIView - - - - IBProjectSource - ./Classes/BuschJaegerManualSettingsView.h - - - - BuschJaegerSettingsView - UIViewController - - id - id - id - - - - onBackClick: - id - - - onManualClick: - id - - - onScanClick: - id - - - - UIView - UIView - UIView - UIView - - - - backButton - UIView - - - manualButton - UIView - - - scanButton - UIView - - - waitView - UIView - - - - IBProjectSource - ./Classes/BuschJaegerSettingsView.h - - - - 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 - - - - UIDigitButton - UILongTouchButton - - addressField - UITextField - - - addressField - - addressField - UITextField - - - - IBProjectSource - ./Classes/UIDigitButton.h - - - - UIHangUpButton - UIButton - - IBProjectSource - ./Classes/UIHangUpButton.h - - - - UILongTouchButton - UIButton - - IBProjectSource - ./Classes/UILongTouchButton.h - - - - UINavigationControllerEx - UINavigationController - - IBProjectSource - ./Classes/UINavigationControllerEx.h - - - - UIRemoteImageView - UIImageView - - IBProjectSource - ./Classes/UIRemoteImageView.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - + 0 IBCocoaTouchFramework @@ -832,6 +332,6 @@ YES 3 - 1926 + 1930 diff --git a/Classes/BuschJaegerWelcomeView.xib b/Classes/BuschJaegerWelcomeView.xib index 1fe034534..f1961ca33 100644 --- a/Classes/BuschJaegerWelcomeView.xib +++ b/Classes/BuschJaegerWelcomeView.xib @@ -2,13 +2,13 @@ 1536 - 11G63 - 2840 - 1138.51 - 569.00 + 12C60 + 2844 + 1187.34 + 625.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 1930 IBProxyObject @@ -41,9 +41,8 @@ 293 - {{82, 17}, {156, 50}} + {{65, 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 @@ -147,9 +144,8 @@ 274 - {{0, 85}, {320, 375}} + {{0, 85}, {320, 364}} - _NS:9 YES @@ -165,11 +161,10 @@ {{0, 20}, {320, 460}} - - 3 - MAA + 1 + MC4xMTc2NDcwNTg4IDAuMTY0NzA1ODgyNCAwLjIxOTYwNzg0MzEAA IBCocoaTouchFramework @@ -340,88 +335,7 @@ 21 - - - - BuschJaegerHistoryTableViewController - UITableViewController - - waitView - UIView - - - waitView - - waitView - UIView - - - - IBProjectSource - ./Classes/BuschJaegerHistoryTableViewController.h - - - - BuschJaegerStationTableViewController - UITableViewController - - IBProjectSource - ./Classes/BuschJaegerStationTableViewController.h - - - - BuschJaegerWelcomeView - UIViewController - - id - id - - - - historyClick: - id - - - settingsClick: - id - - - - UIButton - BuschJaegerHistoryTableViewController - UIButton - BuschJaegerStationTableViewController - UIView - - - - historyButton - UIButton - - - historyTableController - BuschJaegerHistoryTableViewController - - - settingsButton - UIButton - - - stationTableController - BuschJaegerStationTableViewController - - - waitView - UIView - - - - IBProjectSource - ./Classes/BuschJaegerWelcomeView.h - - - - + 0 IBCocoaTouchFramework @@ -434,6 +348,6 @@ {55, 43} {55, 57} - 1926 + 1930 diff --git a/Classes/BuschJaegerWelcomeView~ipad.xib b/Classes/BuschJaegerWelcomeView~ipad.xib index 57ee52b5a..fa45d972f 100644 --- a/Classes/BuschJaegerWelcomeView~ipad.xib +++ b/Classes/BuschJaegerWelcomeView~ipad.xib @@ -2,13 +2,13 @@ 1536 - 11G63 - 2840 - 1138.51 - 569.00 + 12C60 + 2844 + 1187.34 + 625.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 1930 IBProxyObject @@ -187,8 +187,8 @@ - 3 - MAA + 1 + MC4xMTc2NDcwNTg4IDAuMTY0NzA1ODgyNCAwLjIxOTYwNzg0MzEAA @@ -532,6 +532,6 @@ {55, 43} {55, 57} - 1926 + 1930 diff --git a/Classes/LinphoneUI/UIHangUpButton.m b/Classes/LinphoneUI/UIHangUpButton.m index 6cc759087..c4af9a6d8 100644 --- a/Classes/LinphoneUI/UIHangUpButton.m +++ b/Classes/LinphoneUI/UIHangUpButton.m @@ -20,7 +20,6 @@ #import "UIHangUpButton.h" #import "LinphoneManager.h" - @implementation UIHangUpButton diff --git a/Classes/LinphoneUI/UIHistoryCell.xib b/Classes/LinphoneUI/UIHistoryCell.xib index 4eb550191..74c59cb8a 100644 --- a/Classes/LinphoneUI/UIHistoryCell.xib +++ b/Classes/LinphoneUI/UIHistoryCell.xib @@ -2,13 +2,13 @@ 1536 - 11G63 - 2840 - 1138.51 - 569.00 + 12C60 + 2844 + 1187.34 + 625.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 1930 IBProxyObject @@ -42,6 +42,7 @@ 292 {{5, 5}, {32, 32}} + _NS:9 NO @@ -52,6 +53,7 @@ 292 {{45, 10}, {120, 21}} + _NS:9 NO @@ -82,6 +84,7 @@ 289 {{173, 10}, {103, 21}} + _NS:9 NO @@ -109,6 +112,7 @@ 289 {{276, 0}, {44, 44}} + _NS:9 NO IBCocoaTouchFramework @@ -140,6 +144,7 @@ {320, 42} + _NS:9 @@ -261,7 +266,45 @@ 13 - + + + + UIHistoryCell + UITableViewCell + + UILabel + UIRemoteImageView + UILabel + + + + dateLabel + UILabel + + + iconImage + UIRemoteImageView + + + stationLabel + UILabel + + + + IBProjectSource + ./Classes/UIHistoryCell.h + + + + UIRemoteImageView + UIImageView + + IBProjectSource + ./Classes/UIRemoteImageView.h + + + + 0 IBCocoaTouchFramework @@ -274,6 +317,6 @@ trash.png {26, 26} - 1926 + 1930 diff --git a/Classes/LinphoneUI/UIStationCell.h b/Classes/LinphoneUI/UIStationCell.h index 01cdd6171..f7aa46581 100644 --- a/Classes/LinphoneUI/UIStationCell.h +++ b/Classes/LinphoneUI/UIStationCell.h @@ -30,5 +30,4 @@ @property (retain, nonatomic) IBOutlet UIView *cellBackgroundView; - (id)initWithIdentifier:(NSString*)identifier; - @end diff --git a/Classes/LinphoneUI/UIStationCell.m b/Classes/LinphoneUI/UIStationCell.m index 769566f2a..307b701e6 100644 --- a/Classes/LinphoneUI/UIStationCell.m +++ b/Classes/LinphoneUI/UIStationCell.m @@ -20,6 +20,7 @@ #import "UIStationCell.h" #import "BuschJaegerUtils.h" #import +#import "UIView+RoundUIView.h" @implementation UIStationCell @@ -42,13 +43,12 @@ CALayer *layer = cellBackgroundView.layer; layer.name = @"BuschJaegerLayer"; - layer.cornerRadius = 8.0f; - layer.masksToBounds = YES; - layer.borderWidth = 1.0f; - layer.borderColor = [UIColor colorWithWhite:0.5f alpha:0.2f].CGColor; CAGradientLayer *overlayButtonShineLayer; +// [self roundView:cellBackgroundView onCorner:(UIRectCornerBottomLeft|UIRectCornerBottomRight) radius:7.0]; + [cellBackgroundView makeRoundWithCorner:(UIRectCornerBottomLeft|UIRectCornerBottomRight) radius:7.0]; + overlayButtonShineLayer = [CAGradientLayer layer]; overlayButtonShineLayer.name = @"BuschJaegerLayer"; overlayButtonShineLayer.frame = layer.bounds; @@ -57,19 +57,29 @@ 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, + (id)[UIColor colorWithRed:0x2f/255.0f green:0x48/255.0f blue:0x63/255.0f + alpha:1].CGColor, + (id)[UIColor colorWithRed:0x1c/255.0f green:0x27/255.0f blue:0x3b/255.0f + alpha:1].CGColor, nil]; overlayButtonShineLayer.locations = [NSArray arrayWithObjects: [NSNumber numberWithFloat:0.0f], - [NSNumber numberWithFloat:0.1f], - [NSNumber numberWithFloat:0.101f], + [NSNumber numberWithFloat:0.02f], + [NSNumber numberWithFloat:0.021f], [NSNumber numberWithFloat:1.0f], nil]; [layer addSublayer:overlayButtonShineLayer]; + UIView * shadow = [[UIView alloc] initWithFrame:cellBackgroundView.frame]; + shadow.userInteractionEnabled = NO; // Modify this if needed + shadow.layer.shadowColor = [[UIColor blackColor] CGColor]; + shadow.layer.shadowOffset = CGSizeMake(2, 2); + shadow.layer.shadowRadius = 5.0f; + shadow.layer.masksToBounds = NO; + shadow.clipsToBounds = NO; + shadow.layer.shadowOpacity = 0.9f; + [cellBackgroundView.superview insertSubview:shadow belowSubview:cellBackgroundView]; + [shadow addSubview:cellBackgroundView]; } return self; } diff --git a/Classes/LinphoneUI/UIStationCell.xib b/Classes/LinphoneUI/UIStationCell.xib index 06ce2d111..33c319803 100644 --- a/Classes/LinphoneUI/UIStationCell.xib +++ b/Classes/LinphoneUI/UIStationCell.xib @@ -2,13 +2,13 @@ 1536 - 11G63 - 2840 - 1138.51 - 569.00 + 12C60 + 2844 + 1187.34 + 625.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 1930 IBProxyObject @@ -39,12 +39,12 @@ 274 - {320, 100} + {{10, 0}, {300, 90}} _NS:9 - + 3 MCAwAA @@ -53,9 +53,10 @@ 301 - {{146, 44}, {27, 36}} + {{147, 44}, {27, 36}} + _NS:9 NO IBCocoaTouchFramework @@ -67,7 +68,7 @@ 290 - {{20, 10}, {280, 36}} + {{20, 5}, {280, 36}} @@ -104,7 +105,6 @@ _NS:9 - IBCocoaTouchFramework @@ -238,6 +238,6 @@ bj_station.png {27, 36} - 1926 + 1930 diff --git a/Classes/UIView+RoundUIView.h b/Classes/UIView+RoundUIView.h new file mode 100644 index 000000000..46e612080 --- /dev/null +++ b/Classes/UIView+RoundUIView.h @@ -0,0 +1,15 @@ +// +// UIView+RoundUIView.h +// linphone +// +// Created by Jörg Platte on 16.01.13. +// +// + +#import + +@interface UIView (RoundUIView) + +- (void)makeRoundWithCorner:(UIRectCorner)rectCorner radius:(float)radius; + +@end diff --git a/Classes/UIView+RoundUIView.m b/Classes/UIView+RoundUIView.m new file mode 100644 index 000000000..109a4bde0 --- /dev/null +++ b/Classes/UIView+RoundUIView.m @@ -0,0 +1,28 @@ +// +// UIView+RoundUIView.m +// linphone +// +// Created by Jörg Platte on 16.01.13. +// +// + +#import "UIView+RoundUIView.h" +#import +#import + +@implementation UIView (RoundUIView) + +- (void)makeRoundWithCorner:(UIRectCorner)rectCorner radius:(float)radius +{ + UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:self.bounds + byRoundingCorners:rectCorner + cornerRadii:CGSizeMake(radius, radius)]; + CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init]; + maskLayer.frame = self.bounds; + maskLayer.path = maskPath.CGPath; + [self.layer setMask:maskLayer]; + [maskLayer release]; +} + + +@end diff --git a/Classes/en.lproj/BuschJaegerSettingsView.xib b/Classes/en.lproj/BuschJaegerSettingsView.xib index d80985ae6..a83cf9d68 100644 --- a/Classes/en.lproj/BuschJaegerSettingsView.xib +++ b/Classes/en.lproj/BuschJaegerSettingsView.xib @@ -206,7 +206,6 @@ 274 {280, 40} - _NS:9 NO @@ -261,8 +260,8 @@ _NS:9 - 3 - MAA + 1 + MC4xMTc2NDcwNTg4IDAuMTY0NzA1ODgyNCAwLjIxOTYwNzg0MzEAA IBCocoaTouchFramework