diff --git a/Classes/BITFeedbackListViewController.m b/Classes/BITFeedbackListViewController.m index 1b2b0310d7..ff0b36cbf9 100644 --- a/Classes/BITFeedbackListViewController.m +++ b/Classes/BITFeedbackListViewController.m @@ -48,12 +48,12 @@ #define BUTTON_BORDERCOLOR BIT_RGBCOLOR(175, 175, 175) #define BUTTON_BACKGROUNDCOLOR BIT_RGBCOLOR(225, 225, 225) #define BUTTON_TEXTCOLOR BIT_RGBCOLOR(58, 58, 58) -#define BUTTON_TEXTCOLOR_SHADOW BIT_RGBCOLOR(175, 175, 175) +#define BUTTON_TEXTCOLOR_SHADOW BIT_RGBCOLOR(255, 255, 255) #define BUTTON_DELETE_BORDERCOLOR BIT_RGBCOLOR(61, 61, 61) #define BUTTON_DELETE_BACKGROUNDCOLOR BIT_RGBCOLOR(225, 0, 0) #define BUTTON_DELETE_TEXTCOLOR BIT_RGBCOLOR(240, 240, 240) -#define BUTTON_DELETE_TEXTCOLOR_SHADOW BIT_RGBCOLOR(175, 175, 175) +#define BUTTON_DELETE_TEXTCOLOR_SHADOW BIT_RGBCOLOR(125, 0, 0) #define BORDER_COLOR BIT_RGBCOLOR(215, 215, 215) @@ -349,12 +349,14 @@ // button UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom]; button.autoresizingMask = UIViewAutoresizingFlexibleWidth; - [button.layer setCornerRadius:10.0f]; - [button.layer setBorderWidth:1]; - [button.layer setBackgroundColor:BUTTON_BACKGROUNDCOLOR.CGColor]; - [button.layer setBorderColor:BUTTON_BORDERCOLOR.CGColor]; - [button.layer setShadowOffset:CGSizeMake(-1, -1)]; + UIImage *stretchableButton = [bit_imageNamed(@"buttonRoundedRegular.png", BITHOCKEYSDK_BUNDLE) stretchableImageWithLeftCapWidth:10 topCapHeight:0]; + UIImage *stretchableHighlightedButton = [bit_imageNamed(@"buttonRoundedRegularHighlighted.png", BITHOCKEYSDK_BUNDLE) stretchableImageWithLeftCapWidth:10 topCapHeight:0]; + [button setBackgroundImage:stretchableButton forState:UIControlStateNormal]; + [button setBackgroundImage:stretchableHighlightedButton forState:UIControlStateHighlighted]; + + [[button titleLabel] setShadowOffset:CGSizeMake(0, 1)]; [[button titleLabel] setFont:[UIFont boldSystemFontOfSize:14.0]]; + [button setTitleColor:BUTTON_TEXTCOLOR forState:UIControlStateNormal]; [button setTitleShadowColor:BUTTON_TEXTCOLOR_SHADOW forState:UIControlStateNormal]; if (indexPath.section == 0) { @@ -385,8 +387,12 @@ [button addTarget:self action:@selector(setUserDataAction:) forControlEvents:UIControlEventTouchUpInside]; } else { topGap = 0.0f; - [button.layer setBackgroundColor:BUTTON_DELETE_BACKGROUNDCOLOR.CGColor]; - [button.layer setBorderColor:BUTTON_DELETE_BORDERCOLOR.CGColor]; + [[button titleLabel] setShadowOffset:CGSizeMake(0, -1)]; + UIImage *stretchableDeleteButton = [bit_imageNamed(@"buttonRoundedDelete.png", BITHOCKEYSDK_BUNDLE) stretchableImageWithLeftCapWidth:10 topCapHeight:0]; + UIImage *stretchableDeleteHighlightedButton = [bit_imageNamed(@"buttonRoundedDeleteHighlighted.png", BITHOCKEYSDK_BUNDLE) stretchableImageWithLeftCapWidth:10 topCapHeight:0]; + [button setBackgroundImage:stretchableDeleteButton forState:UIControlStateNormal]; + [button setBackgroundImage:stretchableDeleteHighlightedButton forState:UIControlStateHighlighted]; + [button setTitleColor:BUTTON_DELETE_TEXTCOLOR forState:UIControlStateNormal]; [button setTitleShadowColor:BUTTON_DELETE_TEXTCOLOR_SHADOW forState:UIControlStateNormal]; diff --git a/Resources/buttonRoundedDelete.png b/Resources/buttonRoundedDelete.png new file mode 100644 index 0000000000..355697a764 Binary files /dev/null and b/Resources/buttonRoundedDelete.png differ diff --git a/Resources/buttonRoundedDelete@2x.png b/Resources/buttonRoundedDelete@2x.png new file mode 100644 index 0000000000..0fdb545e75 Binary files /dev/null and b/Resources/buttonRoundedDelete@2x.png differ diff --git a/Resources/buttonRoundedDeleteHighlighted.png b/Resources/buttonRoundedDeleteHighlighted.png new file mode 100644 index 0000000000..852e04f6e6 Binary files /dev/null and b/Resources/buttonRoundedDeleteHighlighted.png differ diff --git a/Resources/buttonRoundedDeleteHighlighted@2x.png b/Resources/buttonRoundedDeleteHighlighted@2x.png new file mode 100644 index 0000000000..7a5f4b0d44 Binary files /dev/null and b/Resources/buttonRoundedDeleteHighlighted@2x.png differ diff --git a/Resources/buttonRoundedRegular.png b/Resources/buttonRoundedRegular.png new file mode 100644 index 0000000000..e6afc7c074 Binary files /dev/null and b/Resources/buttonRoundedRegular.png differ diff --git a/Resources/buttonRoundedRegular@2x.png b/Resources/buttonRoundedRegular@2x.png new file mode 100644 index 0000000000..a53f0efff6 Binary files /dev/null and b/Resources/buttonRoundedRegular@2x.png differ diff --git a/Resources/buttonRoundedRegularHighlighted.png b/Resources/buttonRoundedRegularHighlighted.png new file mode 100644 index 0000000000..7847917666 Binary files /dev/null and b/Resources/buttonRoundedRegularHighlighted.png differ diff --git a/Resources/buttonRoundedRegularHighlighted@2x.png b/Resources/buttonRoundedRegularHighlighted@2x.png new file mode 100644 index 0000000000..969fbe8206 Binary files /dev/null and b/Resources/buttonRoundedRegularHighlighted@2x.png differ diff --git a/Support/HockeySDK.xcodeproj/project.pbxproj b/Support/HockeySDK.xcodeproj/project.pbxproj index e5272cf8e9..75bc72b171 100644 --- a/Support/HockeySDK.xcodeproj/project.pbxproj +++ b/Support/HockeySDK.xcodeproj/project.pbxproj @@ -33,6 +33,14 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ + 1E1127C416580C87007067A2 /* buttonRoundedDelete.png in Resources */ = {isa = PBXBuildFile; fileRef = 1E1127BC16580C87007067A2 /* buttonRoundedDelete.png */; }; + 1E1127C516580C87007067A2 /* buttonRoundedDelete@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1E1127BD16580C87007067A2 /* buttonRoundedDelete@2x.png */; }; + 1E1127C616580C87007067A2 /* buttonRoundedDeleteHighlighted.png in Resources */ = {isa = PBXBuildFile; fileRef = 1E1127BE16580C87007067A2 /* buttonRoundedDeleteHighlighted.png */; }; + 1E1127C716580C87007067A2 /* buttonRoundedDeleteHighlighted@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1E1127BF16580C87007067A2 /* buttonRoundedDeleteHighlighted@2x.png */; }; + 1E1127C816580C87007067A2 /* buttonRoundedRegular.png in Resources */ = {isa = PBXBuildFile; fileRef = 1E1127C016580C87007067A2 /* buttonRoundedRegular.png */; }; + 1E1127C916580C87007067A2 /* buttonRoundedRegular@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1E1127C116580C87007067A2 /* buttonRoundedRegular@2x.png */; }; + 1E1127CA16580C87007067A2 /* buttonRoundedRegularHighlighted.png in Resources */ = {isa = PBXBuildFile; fileRef = 1E1127C216580C87007067A2 /* buttonRoundedRegularHighlighted.png */; }; + 1E1127CB16580C87007067A2 /* buttonRoundedRegularHighlighted@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1E1127C316580C87007067A2 /* buttonRoundedRegularHighlighted@2x.png */; }; 1E27EF2515BB5033000AE995 /* HockeySDK.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1E59555F15B6F80E00A03429 /* HockeySDK.strings */; }; 1E49A43C1612223B00463151 /* BITFeedbackComposeViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1E49A42D1612223B00463151 /* BITFeedbackComposeViewController.h */; settings = {ATTRIBUTES = (Public, ); }; }; 1E49A43F1612223B00463151 /* BITFeedbackComposeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E49A42E1612223B00463151 /* BITFeedbackComposeViewController.m */; }; @@ -122,6 +130,14 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 1E1127BC16580C87007067A2 /* buttonRoundedDelete.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = buttonRoundedDelete.png; sourceTree = ""; }; + 1E1127BD16580C87007067A2 /* buttonRoundedDelete@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "buttonRoundedDelete@2x.png"; sourceTree = ""; }; + 1E1127BE16580C87007067A2 /* buttonRoundedDeleteHighlighted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = buttonRoundedDeleteHighlighted.png; sourceTree = ""; }; + 1E1127BF16580C87007067A2 /* buttonRoundedDeleteHighlighted@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "buttonRoundedDeleteHighlighted@2x.png"; sourceTree = ""; }; + 1E1127C016580C87007067A2 /* buttonRoundedRegular.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = buttonRoundedRegular.png; sourceTree = ""; }; + 1E1127C116580C87007067A2 /* buttonRoundedRegular@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "buttonRoundedRegular@2x.png"; sourceTree = ""; }; + 1E1127C216580C87007067A2 /* buttonRoundedRegularHighlighted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = buttonRoundedRegularHighlighted.png; sourceTree = ""; }; + 1E1127C316580C87007067A2 /* buttonRoundedRegularHighlighted@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "buttonRoundedRegularHighlighted@2x.png"; sourceTree = ""; }; 1E49A42D1612223B00463151 /* BITFeedbackComposeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BITFeedbackComposeViewController.h; sourceTree = ""; }; 1E49A42E1612223B00463151 /* BITFeedbackComposeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITFeedbackComposeViewController.m; sourceTree = ""; }; 1E49A42F1612223B00463151 /* BITFeedbackListViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BITFeedbackListViewCell.h; sourceTree = ""; }; @@ -241,6 +257,14 @@ 1E5955BF15B71C8600A03429 /* bg.png */, 1E5955C015B71C8600A03429 /* buttonHighlight.png */, 1E5955C115B71C8600A03429 /* buttonHighlight@2x.png */, + 1E1127BC16580C87007067A2 /* buttonRoundedDelete.png */, + 1E1127BD16580C87007067A2 /* buttonRoundedDelete@2x.png */, + 1E1127BE16580C87007067A2 /* buttonRoundedDeleteHighlighted.png */, + 1E1127BF16580C87007067A2 /* buttonRoundedDeleteHighlighted@2x.png */, + 1E1127C016580C87007067A2 /* buttonRoundedRegular.png */, + 1E1127C116580C87007067A2 /* buttonRoundedRegular@2x.png */, + 1E1127C216580C87007067A2 /* buttonRoundedRegularHighlighted.png */, + 1E1127C316580C87007067A2 /* buttonRoundedRegularHighlighted@2x.png */, 1E5955C415B71C8600A03429 /* IconGradient.png */, 1E5955C515B71C8600A03429 /* IconGradient@2x.png */, 1EAF20A4162DC0F600957B1D /* feedbackActivity@2x~ipad.png */, @@ -543,6 +567,14 @@ 1EAF20A9162DC0F600957B1D /* feedbackActivity~ipad.png in Resources */, 1EAF20AA162DC0F600957B1D /* feedbackActiviy.png in Resources */, 1EAF20AB162DC0F600957B1D /* feedbackActiviy@2x.png in Resources */, + 1E1127C416580C87007067A2 /* buttonRoundedDelete.png in Resources */, + 1E1127C516580C87007067A2 /* buttonRoundedDelete@2x.png in Resources */, + 1E1127C616580C87007067A2 /* buttonRoundedDeleteHighlighted.png in Resources */, + 1E1127C716580C87007067A2 /* buttonRoundedDeleteHighlighted@2x.png in Resources */, + 1E1127C816580C87007067A2 /* buttonRoundedRegular.png in Resources */, + 1E1127C916580C87007067A2 /* buttonRoundedRegular@2x.png in Resources */, + 1E1127CA16580C87007067A2 /* buttonRoundedRegularHighlighted.png in Resources */, + 1E1127CB16580C87007067A2 /* buttonRoundedRegularHighlighted@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; };