diff --git a/Classes/BITFeedbackListViewCell.h b/Classes/BITFeedbackListViewCell.h index daf09b4cc1..64e4e69306 100644 --- a/Classes/BITFeedbackListViewCell.h +++ b/Classes/BITFeedbackListViewCell.h @@ -28,11 +28,8 @@ #import - -typedef enum { - BITFeedbackListViewCellStyleNormal = 0, // right aligned header style - BITFeedbackListViewCellStyleRepsonse = 1 // left aligned header style for dev responses -} BITFeedbackListViewCellStyle; +#import "BITFeedbackMessage.h" +#import "BITAttributedLabel.h" typedef enum { BITFeedbackListViewCellBackgroundStyleNormal = 0, @@ -41,14 +38,12 @@ typedef enum { @interface BITFeedbackListViewCell : UITableViewCell -@property (nonatomic) BITFeedbackListViewCellStyle style; +@property (nonatomic, retain) BITFeedbackMessage *message; + @property (nonatomic) BITFeedbackListViewCellBackgroundStyle backgroundStyle; -@property (nonatomic) BOOL sent; -@property (nonatomic, copy) NSDate *date; -@property (nonatomic, copy) NSString *name; -@property (nonatomic, copy) NSString *text; +@property (nonatomic, retain) BITAttributedLabel *labelText; -+ (CGFloat) heightForRowWithText:(NSString *)text tableViewWidth:(CGFloat)width; ++ (CGFloat) heightForRowWithMessage:(BITFeedbackMessage *)message tableViewWidth:(CGFloat)width; @end diff --git a/Classes/BITFeedbackListViewCell.m b/Classes/BITFeedbackListViewCell.m index 12f5062e77..51750e9146 100644 --- a/Classes/BITFeedbackListViewCell.m +++ b/Classes/BITFeedbackListViewCell.m @@ -57,7 +57,6 @@ @property (nonatomic, retain) NSDateFormatter *timeFormatter; @property (nonatomic, retain) UILabel *labelTitle; -@property (nonatomic, retain) UILabel *labelText; @end @@ -69,13 +68,9 @@ self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; if (self) { // Initialization code - _style = BITFeedbackListViewCellStyleNormal; _backgroundStyle = BITFeedbackListViewCellBackgroundStyleNormal; - _sent = YES; - _date = nil; - _name = nil; - _text = nil; + _message = nil; self.dateFormatter = [[[NSDateFormatter alloc] init] autorelease]; [self.dateFormatter setTimeStyle:NSDateFormatterNoStyle]; @@ -92,10 +87,11 @@ self.labelTitle = [[[UILabel alloc] init] autorelease]; self.labelTitle.font = [UIFont systemFontOfSize:TITLE_FONTSIZE]; - self.labelText = [[[UILabel alloc] init] autorelease]; + self.labelText = [[[BITAttributedLabel alloc] init] autorelease]; self.labelText.font = [UIFont systemFontOfSize:TEXT_FONTSIZE]; self.labelText.numberOfLines = 0; self.labelText.textAlignment = UITextAlignmentLeft; + self.labelText.dataDetectorTypes = UIDataDetectorTypeAll; } return self; } @@ -107,9 +103,7 @@ [_labelTitle release], _labelTitle = nil; [_labelText release], _labelText = nil; - [_date release], _date = nil; - [_name release], _name = nil; - [_text release], _text = nil; + [_message release], _message = nil; [super dealloc]; } @@ -132,15 +126,15 @@ #pragma mark - Layout -+ (CGFloat) heightForRowWithText:(NSString *)text tableViewWidth:(CGFloat)width { - CGFloat calculatedHeight = [text sizeWithFont:[UIFont systemFontOfSize:TEXT_FONTSIZE] ++ (CGFloat) heightForRowWithMessage:(BITFeedbackMessage *)message tableViewWidth:(CGFloat)width { + CGFloat calculatedHeight = [message.text sizeWithFont:[UIFont systemFontOfSize:TEXT_FONTSIZE] constrainedToSize:CGSizeMake(width - (2 * FRAME_SIDE_BORDER), CGFLOAT_MAX)].height + FRAME_TOP_BORDER + LABEL_TEXT_Y + FRAME_BOTTOM_BORDER; return calculatedHeight; } - (void)layoutSubviews { UIView *accessoryViewBackground = [[[UIView alloc] initWithFrame:CGRectMake(0, 2, self.frame.size.width * 2, self.frame.size.height - 2)] autorelease]; - + // colors if (_backgroundStyle == BITFeedbackListViewCellBackgroundStyleNormal) { accessoryViewBackground.backgroundColor = BACKGROUNDCOLOR_DEFAULT; @@ -154,30 +148,30 @@ self.labelText.backgroundColor = BACKGROUNDCOLOR_ALTERNATE; } self.labelTitle.textColor = TEXTCOLOR_TITLE; - if (self.sent) { - [self.labelText setTextColor:TEXTCOLOR_DEFAULT]; - } else { + if (_message.status == BITFeedbackMessageStatusSendPending || _message.status == BITFeedbackMessageStatusSendInProgress) { [self.labelText setTextColor:TEXTCOLOR_PENDING]; + } else { + [self.labelText setTextColor:TEXTCOLOR_DEFAULT]; } // background for deletion accessory view [self addSubview:accessoryViewBackground]; - + // header NSString *dateString; - if (self.date) { - if ([self isSameDayWithDate1:[NSDate date] date2:self.date]) { - dateString = [self.timeFormatter stringFromDate:self.date]; - } else { - dateString = [self.dateFormatter stringFromDate:self.date]; - } - } else { + if (_message.status == BITFeedbackMessageStatusSendPending || _message.status == BITFeedbackMessageStatusSendInProgress) { dateString = BITHockeyLocalizedString(@"Pending"); + } else { + if ([self isSameDayWithDate1:[NSDate date] date2:_message.date]) { + dateString = [self.timeFormatter stringFromDate:_message.date]; + } else { + dateString = [self.dateFormatter stringFromDate:_message.date]; + } } [self.labelTitle setText:dateString];// [self.date description]]; [self.labelTitle setFrame:CGRectMake(FRAME_SIDE_BORDER, FRAME_TOP_BORDER + LABEL_TITLE_Y, self.frame.size.width - (2 * FRAME_SIDE_BORDER), LABEL_TITLE_HEIGHT)]; - if (_style == BITFeedbackListViewCellStyleNormal) { + if (_message.userMessage) { self.labelTitle.textAlignment = UITextAlignmentRight; self.labelText.textAlignment = UITextAlignmentRight; } else { @@ -188,9 +182,9 @@ [self addSubview:self.labelTitle]; // text - [self.labelText setText:self.text]; + [self.labelText setText:_message.text]; CGSize size = CGSizeMake(self.frame.size.width - (2 * FRAME_SIDE_BORDER), - [[self class] heightForRowWithText:self.text tableViewWidth:self.frame.size.width] - LABEL_TEXT_Y - FRAME_BOTTOM_BORDER); + [[self class] heightForRowWithMessage:_message tableViewWidth:self.frame.size.width] - LABEL_TEXT_Y - FRAME_BOTTOM_BORDER); [self.labelText setFrame:CGRectMake(FRAME_SIDE_BORDER, LABEL_TEXT_Y, size.width, size.height)]; diff --git a/Classes/BITFeedbackListViewController.m b/Classes/BITFeedbackListViewController.m index fc92320517..5a1bf7868f 100644 --- a/Classes/BITFeedbackListViewController.m +++ b/Classes/BITFeedbackListViewController.m @@ -36,6 +36,7 @@ #import "BITFeedbackComposeViewController.h" #import "BITFeedbackUserDataViewController.h" #import "BITFeedbackMessage.h" +#import "BITAttributedLabel.h" #import "BITHockeyHelper.h" #import @@ -54,7 +55,7 @@ #define BORDER_COLOR2 BIT_RGBCOLOR(221, 221, 221) #define BORDER_COLOR3 BIT_RGBCOLOR(255, 255, 255) -@interface BITFeedbackListViewController () +@interface BITFeedbackListViewController () @property (nonatomic, assign) BITFeedbackManager *manager; @property (nonatomic, retain) NSDateFormatter *lastUpdateDateFormatter; @@ -217,6 +218,7 @@ destructiveButtonTitle:BITHockeyLocalizedString(@"HockeyFeedbackListDeleteAllDelete") otherButtonTitles:nil ]; + [deleteAction setTag:0]; [deleteAction setActionSheetStyle:UIActionSheetStyleBlackTranslucent]; [deleteAction showInView:self.view]; [deleteAction release]; @@ -227,9 +229,9 @@ cancelButtonTitle:BITHockeyLocalizedString(@"HockeyFeedbackListDeleteAllCancel") otherButtonTitles:BITHockeyLocalizedString(@"HockeyFeedbackListDeleteAllDelete"), nil]; + [deleteAction setTag:0]; [deleteAction show]; [deleteAction release]; - } } @@ -316,7 +318,7 @@ cell.textLabel.numberOfLines = 0; cell.accessoryType = UITableViewCellAccessoryNone; cell.selectionStyle = UITableViewCellSelectionStyleNone; - + // button UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom]; [button.layer setMasksToBounds:YES]; @@ -413,31 +415,9 @@ } BITFeedbackMessage *message = [self.manager messageAtIndex:indexPath.row]; - cell.date = message.date; - - if (message.userMessage) { - cell.style = BITFeedbackListViewCellStyleNormal; - if ([self.manager requireUserName] == BITFeedbackUserDataElementRequired || - ([self.manager requireUserName] == BITFeedbackUserDataElementOptional && [self.manager userName] != nil) - ) { - cell.name = [self.manager userName]; - } else { - cell.name = BITHockeyLocalizedString(@"HockeyFeedbackListMessageUserNameNotSet"); - } - } else { - cell.style = BITFeedbackListViewCellStyleRepsonse; - if (message.name && [message.name length] > 0) { - cell.name = message.name; - } else { - cell.name = BITHockeyLocalizedString(@"HockeyFeedbackListMessageResponseNameNotSet"); - } - } - - if (message.text) { - cell.text = message.text; - } else { - cell.text = @""; - } + cell.message = message; + cell.labelText.delegate = self; + cell.labelText.userInteractionEnabled = YES; UIView *lineView1 = [[[UIView alloc] initWithFrame:CGRectMake(0, 0, cell.contentView.bounds.size.width, 1)] autorelease]; lineView1.backgroundColor = BORDER_COLOR1; @@ -468,8 +448,13 @@ - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath { if (editingStyle == UITableViewCellEditingStyleDelete) { + NSLog(@"%i %i", indexPath.section, indexPath.row); if ([_manager deleteMessageAtIndex:indexPath.row]) { - [tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationAutomatic]; + if ([_manager numberOfMessages] > 0) { + [tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationAutomatic]; + } else { + [tableView reloadData]; + } } } } @@ -488,15 +473,23 @@ BITFeedbackMessage *message = [self.manager messageAtIndex:indexPath.row]; if (!message) return 44; - return [BITFeedbackListViewCell heightForRowWithText:message.text tableViewWidth:self.view.frame.size.width]; + return [BITFeedbackListViewCell heightForRowWithMessage:message tableViewWidth:self.view.frame.size.width]; } #pragma mark - UIAlertViewDelegate - (void)alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger)buttonIndex { - if (buttonIndex == [alertView firstOtherButtonIndex]) { - [self deleteAllMessages]; + if (buttonIndex == alertView.cancelButtonIndex) { + return; + } + + if ([alertView tag] == 0) { + if (buttonIndex == [alertView firstOtherButtonIndex]) { + [self deleteAllMessages]; + } + } else { + [[UIApplication sharedApplication] openURL:[NSURL URLWithString:alertView.title]]; } } @@ -504,10 +497,45 @@ #pragma mark - UIActionSheetDelegate - (void)actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger)buttonIndex { - if (buttonIndex == [actionSheet destructiveButtonIndex]) { - [self deleteAllMessages]; + if (buttonIndex == actionSheet.cancelButtonIndex) { + return; + } + + if ([actionSheet tag] == 0) { + if (buttonIndex == [actionSheet destructiveButtonIndex]) { + [self deleteAllMessages]; + } + } else { + [[UIApplication sharedApplication] openURL:[NSURL URLWithString:actionSheet.title]]; } } +#pragma mark - BITAttributedLabelDelegate + +- (void)attributedLabel:(BITAttributedLabel *)label didSelectLinkWithURL:(NSURL *)url { + if (UI_USER_INTERFACE_IDIOM() != UIUserInterfaceIdiomPad) { + UIActionSheet *linkAction = [[UIActionSheet alloc] initWithTitle:[url absoluteString] + delegate:self + cancelButtonTitle:BITHockeyLocalizedString(@"HockeyFeedbackListCancelOpenLink") + destructiveButtonTitle:nil + otherButtonTitles:BITHockeyLocalizedString(@"HockeyFeedbackListOpenLinkInSafari"), nil + ]; + [linkAction setTag:1]; + [linkAction setActionSheetStyle:UIActionSheetStyleBlackTranslucent]; + [linkAction showInView:self.view]; + [linkAction release]; + } else { + UIAlertView *linkAction = [[UIAlertView alloc] initWithTitle:[url absoluteString] + message:nil + delegate:self + cancelButtonTitle:BITHockeyLocalizedString(@"HockeyFeedbackListCancelOpenLink") + otherButtonTitles:BITHockeyLocalizedString(@"HockeyFeedbackListOpenLinkInSafari"), nil]; + + [linkAction setTag:1]; + [linkAction show]; + [linkAction release]; + } +} + @end diff --git a/Classes/BITFeedbackManager.m b/Classes/BITFeedbackManager.m index c8803bd923..74223a6cb7 100644 --- a/Classes/BITFeedbackManager.m +++ b/Classes/BITFeedbackManager.m @@ -799,6 +799,7 @@ // app defined user data may have changed, update it [self updateAppDefinedUserData]; + [self saveMessages]; NSArray *pendingMessages = [self messagesWithStatus:BITFeedbackMessageStatusSendPending]; diff --git a/Classes/BITFeedbackMessage.m b/Classes/BITFeedbackMessage.m index 1087027950..8fca1d706a 100644 --- a/Classes/BITFeedbackMessage.m +++ b/Classes/BITFeedbackMessage.m @@ -39,7 +39,7 @@ _text = nil; _name = nil; _email = nil; - _date = nil; + _date = [[NSDate alloc] init]; _token = nil; _id = [[NSNumber alloc] initWithInteger:0]; _status = BITFeedbackMessageStatusSendPending; diff --git a/Resources/de.lproj/HockeySDK.strings b/Resources/de.lproj/HockeySDK.strings index 10752150a0..ca8120c9a4 100755 --- a/Resources/de.lproj/HockeySDK.strings +++ b/Resources/de.lproj/HockeySDK.strings @@ -161,17 +161,11 @@ /* Button title for deleting all local messages*/ "HockeyFeedbackListButonDeleteAllMessages" = "Delete All Messages"; -/* User Name In Message If Name Not Set */ -"HockeyFeedbackListMessageUserNameNotSet" = "You"; - -/* Name In Message From Server If Name Not Set */ -"HockeyFeedbackListMessageResponseNameNotSet" = "Response"; - /* Message pending to be send */ "HockeyFeedbackListMessagePending" = "Pending"; -/* Delete All Messages Action Sheet */ +/* Delete All Messages Action Sheet / Alert View */ /* Title for the Action Sheet */ "HockeyFeedbackListDeleteAllTitle" = "This will delete all messages on this device."; @@ -183,6 +177,15 @@ "HockeyFeedbackListDeleteAllCancel" = "Cancel"; +/* Open Link In Safari Action Sheet / Alert View */ + +/* Title for the Action Sheet */ +"HockeyFeedbackListCancelOpenLink" = "Cancel"; + +/* Title for the Action Sheet */ +"HockeyFeedbackListOpenLinkInSafari" = "Open Link in Safari"; + + /* UIActivity */ /* Activity Sharing Button Title, App Name will be inserted */ diff --git a/Resources/en.lproj/HockeySDK.strings b/Resources/en.lproj/HockeySDK.strings index 5d8d491e2b..000f7525b1 100755 --- a/Resources/en.lproj/HockeySDK.strings +++ b/Resources/en.lproj/HockeySDK.strings @@ -158,17 +158,11 @@ /* Button title for deleting all local messages*/ "HockeyFeedbackListButonDeleteAllMessages" = "Delete All Messages"; -/* User Name In Message If Name Not Set */ -"HockeyFeedbackListMessageUserNameNotSet" = "You"; - -/* Name In Message From Server If Name Not Set */ -"HockeyFeedbackListMessageResponseNameNotSet" = "Response"; - /* Message pending to be send */ "HockeyFeedbackListMessagePending" = "Pending"; -/* Delete All Messages Action Sheet */ +/* Delete All Messages Action Sheet / Alert View */ /* Title for the Action Sheet */ "HockeyFeedbackListDeleteAllTitle" = "This will delete all messages on this device."; @@ -180,6 +174,14 @@ "HockeyFeedbackListDeleteAllCancel" = "Cancel"; +/* Open Link In Safari Action Sheet / Alert View */ + +/* Title for the Action Sheet */ +"HockeyFeedbackListCancelOpenLink" = "Cancel"; + +/* Title for the Action Sheet */ +"HockeyFeedbackListOpenLinkInSafari" = "Open Link in Safari"; + /* UIActivity */ /* Activity Sharing Button Title, App Name will be inserted */ diff --git a/Resources/es.lproj/HockeySDK.strings b/Resources/es.lproj/HockeySDK.strings index 0b77a04f72..d564286203 100755 --- a/Resources/es.lproj/HockeySDK.strings +++ b/Resources/es.lproj/HockeySDK.strings @@ -159,17 +159,11 @@ /* Button title for deleting all local messages*/ "HockeyFeedbackListButonDeleteAllMessages" = "Delete All Messages"; -/* User Name In Message If Name Not Set */ -"HockeyFeedbackListMessageUserNameNotSet" = "You"; - -/* Name In Message From Server If Name Not Set */ -"HockeyFeedbackListMessageResponseNameNotSet" = "Response"; - /* Message pending to be send */ "HockeyFeedbackListMessagePending" = "Pending"; -/* Delete All Messages Action Sheet */ +/* Delete All Messages Action Sheet / Alert View */ /* Title for the Action Sheet */ "HockeyFeedbackListDeleteAllTitle" = "This will delete all messages on this device."; @@ -181,6 +175,14 @@ "HockeyFeedbackListDeleteAllCancel" = "Cancel"; +/* Open Link In Safari Action Sheet / Alert View */ + +/* Title for the Action Sheet */ +"HockeyFeedbackListCancelOpenLink" = "Cancel"; + +/* Title for the Action Sheet */ +"HockeyFeedbackListOpenLinkInSafari" = "Open Link in Safari"; + /* UIActivity */ /* Activity Sharing Button Title, App Name will be inserted */ diff --git a/Resources/fr.lproj/HockeySDK.strings b/Resources/fr.lproj/HockeySDK.strings index 03544f3632..a337dbab5f 100755 --- a/Resources/fr.lproj/HockeySDK.strings +++ b/Resources/fr.lproj/HockeySDK.strings @@ -159,17 +159,11 @@ /* Button title for deleting all local messages*/ "HockeyFeedbackListButonDeleteAllMessages" = "Delete All Messages"; -/* User Name In Message If Name Not Set */ -"HockeyFeedbackListMessageUserNameNotSet" = "You"; - -/* Name In Message From Server If Name Not Set */ -"HockeyFeedbackListMessageResponseNameNotSet" = "Response"; - /* Message pending to be send */ "HockeyFeedbackListMessagePending" = "Pending"; -/* Delete All Messages Action Sheet */ +/* Delete All Messages Action Sheet / Alert View */ /* Title for the Action Sheet */ "HockeyFeedbackListDeleteAllTitle" = "This will delete all messages on this device."; @@ -181,6 +175,14 @@ "HockeyFeedbackListDeleteAllCancel" = "Cancel"; +/* Open Link In Safari Action Sheet / Alert View */ + +/* Title for the Action Sheet */ +"HockeyFeedbackListCancelOpenLink" = "Cancel"; + +/* Title for the Action Sheet */ +"HockeyFeedbackListOpenLinkInSafari" = "Open Link in Safari"; + /* UIActivity */ /* Activity Sharing Button Title, App Name will be inserted */ diff --git a/Resources/it.lproj/HockeySDK.strings b/Resources/it.lproj/HockeySDK.strings index eb59079b5d..809e84484c 100755 --- a/Resources/it.lproj/HockeySDK.strings +++ b/Resources/it.lproj/HockeySDK.strings @@ -159,17 +159,11 @@ /* Button title for deleting all local messages*/ "HockeyFeedbackListButonDeleteAllMessages" = "Delete All Messages"; -/* User Name In Message If Name Not Set */ -"HockeyFeedbackListMessageUserNameNotSet" = "You"; - -/* Name In Message From Server If Name Not Set */ -"HockeyFeedbackListMessageResponseNameNotSet" = "Response"; - /* Message pending to be send */ "HockeyFeedbackListMessagePending" = "Pending"; -/* Delete All Messages Action Sheet */ +/* Delete All Messages Action Sheet / Alert View */ /* Title for the Action Sheet */ "HockeyFeedbackListDeleteAllTitle" = "This will delete all messages on this device."; @@ -181,6 +175,14 @@ "HockeyFeedbackListDeleteAllCancel" = "Cancel"; +/* Open Link In Safari Action Sheet / Alert View */ + +/* Title for the Action Sheet */ +"HockeyFeedbackListCancelOpenLink" = "Cancel"; + +/* Title for the Action Sheet */ +"HockeyFeedbackListOpenLinkInSafari" = "Open Link in Safari"; + /* UIActivity */ /* Activity Sharing Button Title, App Name will be inserted */ diff --git a/Resources/ja.lproj/HockeySDK.strings b/Resources/ja.lproj/HockeySDK.strings index b9d77d1e26..fc9703dadb 100755 --- a/Resources/ja.lproj/HockeySDK.strings +++ b/Resources/ja.lproj/HockeySDK.strings @@ -159,17 +159,11 @@ /* Button title for deleting all local messages*/ "HockeyFeedbackListButonDeleteAllMessages" = "Delete All Messages"; -/* User Name In Message If Name Not Set */ -"HockeyFeedbackListMessageUserNameNotSet" = "You"; - -/* Name In Message From Server If Name Not Set */ -"HockeyFeedbackListMessageResponseNameNotSet" = "Response"; - /* Message pending to be send */ "HockeyFeedbackListMessagePending" = "Pending"; -/* Delete All Messages Action Sheet */ +/* Delete All Messages Action Sheet / Alert View */ /* Title for the Action Sheet */ "HockeyFeedbackListDeleteAllTitle" = "This will delete all messages on this device."; @@ -181,6 +175,14 @@ "HockeyFeedbackListDeleteAllCancel" = "Cancel"; +/* Open Link In Safari Action Sheet / Alert View */ + +/* Title for the Action Sheet */ +"HockeyFeedbackListCancelOpenLink" = "Cancel"; + +/* Title for the Action Sheet */ +"HockeyFeedbackListOpenLinkInSafari" = "Open Link in Safari"; + /* UIActivity */ /* Activity Sharing Button Title, App Name will be inserted */ diff --git a/Resources/nl.lproj/HockeySDK.strings b/Resources/nl.lproj/HockeySDK.strings index b88870c418..eb9e9162c7 100755 --- a/Resources/nl.lproj/HockeySDK.strings +++ b/Resources/nl.lproj/HockeySDK.strings @@ -159,17 +159,11 @@ /* Button title for deleting all local messages*/ "HockeyFeedbackListButonDeleteAllMessages" = "Delete All Messages"; -/* User Name In Message If Name Not Set */ -"HockeyFeedbackListMessageUserNameNotSet" = "You"; - -/* Name In Message From Server If Name Not Set */ -"HockeyFeedbackListMessageResponseNameNotSet" = "Response"; - /* Message pending to be send */ "HockeyFeedbackListMessagePending" = "Pending"; -/* Delete All Messages Action Sheet */ +/* Delete All Messages Action Sheet / Alert View */ /* Title for the Action Sheet */ "HockeyFeedbackListDeleteAllTitle" = "This will delete all messages on this device."; @@ -181,6 +175,14 @@ "HockeyFeedbackListDeleteAllCancel" = "Cancel"; +/* Open Link In Safari Action Sheet / Alert View */ + +/* Title for the Action Sheet */ +"HockeyFeedbackListCancelOpenLink" = "Cancel"; + +/* Title for the Action Sheet */ +"HockeyFeedbackListOpenLinkInSafari" = "Open Link in Safari"; + /* UIActivity */ /* Activity Sharing Button Title, App Name will be inserted */ diff --git a/Resources/pt-PT.lproj/HockeySDK.strings b/Resources/pt-PT.lproj/HockeySDK.strings index 0d10b8355b..2ed9221d0d 100755 --- a/Resources/pt-PT.lproj/HockeySDK.strings +++ b/Resources/pt-PT.lproj/HockeySDK.strings @@ -159,17 +159,11 @@ /* Button title for deleting all local messages*/ "HockeyFeedbackListButonDeleteAllMessages" = "Delete All Messages"; -/* User Name In Message If Name Not Set */ -"HockeyFeedbackListMessageUserNameNotSet" = "You"; - -/* Name In Message From Server If Name Not Set */ -"HockeyFeedbackListMessageResponseNameNotSet" = "Response"; - /* Message pending to be send */ "HockeyFeedbackListMessagePending" = "Pending"; -/* Delete All Messages Action Sheet */ +/* Delete All Messages Action Sheet / Alert View */ /* Title for the Action Sheet */ "HockeyFeedbackListDeleteAllTitle" = "This will delete all messages on this device."; @@ -181,6 +175,14 @@ "HockeyFeedbackListDeleteAllCancel" = "Cancel"; +/* Open Link In Safari Action Sheet / Alert View */ + +/* Title for the Action Sheet */ +"HockeyFeedbackListCancelOpenLink" = "Cancel"; + +/* Title for the Action Sheet */ +"HockeyFeedbackListOpenLinkInSafari" = "Open Link in Safari"; + /* UIActivity */ /* Activity Sharing Button Title, App Name will be inserted */ diff --git a/Resources/pt.lproj/HockeySDK.strings b/Resources/pt.lproj/HockeySDK.strings index 4e42872a64..8263e6378c 100755 --- a/Resources/pt.lproj/HockeySDK.strings +++ b/Resources/pt.lproj/HockeySDK.strings @@ -159,17 +159,11 @@ /* Button title for deleting all local messages*/ "HockeyFeedbackListButonDeleteAllMessages" = "Delete All Messages"; -/* User Name In Message If Name Not Set */ -"HockeyFeedbackListMessageUserNameNotSet" = "You"; - -/* Name In Message From Server If Name Not Set */ -"HockeyFeedbackListMessageResponseNameNotSet" = "Response"; - /* Message pending to be send */ "HockeyFeedbackListMessagePending" = "Pending"; -/* Delete All Messages Action Sheet */ +/* Delete All Messages Action Sheet / Alert View */ /* Title for the Action Sheet */ "HockeyFeedbackListDeleteAllTitle" = "This will delete all messages on this device."; @@ -181,6 +175,14 @@ "HockeyFeedbackListDeleteAllCancel" = "Cancel"; +/* Open Link In Safari Action Sheet / Alert View */ + +/* Title for the Action Sheet */ +"HockeyFeedbackListCancelOpenLink" = "Cancel"; + +/* Title for the Action Sheet */ +"HockeyFeedbackListOpenLinkInSafari" = "Open Link in Safari"; + /* UIActivity */ /* Activity Sharing Button Title, App Name will be inserted */ diff --git a/Resources/ru.lproj/HockeySDK.strings b/Resources/ru.lproj/HockeySDK.strings index 844b7b30ce..8051c193cc 100755 --- a/Resources/ru.lproj/HockeySDK.strings +++ b/Resources/ru.lproj/HockeySDK.strings @@ -159,17 +159,11 @@ /* Button title for deleting all local messages*/ "HockeyFeedbackListButonDeleteAllMessages" = "Delete All Messages"; -/* User Name In Message If Name Not Set */ -"HockeyFeedbackListMessageUserNameNotSet" = "You"; - -/* Name In Message From Server If Name Not Set */ -"HockeyFeedbackListMessageResponseNameNotSet" = "Response"; - /* Message pending to be send */ "HockeyFeedbackListMessagePending" = "Pending"; -/* Delete All Messages Action Sheet */ +/* Delete All Messages Action Sheet / Alert View */ /* Title for the Action Sheet */ "HockeyFeedbackListDeleteAllTitle" = "This will delete all messages on this device."; @@ -181,6 +175,14 @@ "HockeyFeedbackListDeleteAllCancel" = "Cancel"; +/* Open Link In Safari Action Sheet / Alert View */ + +/* Title for the Action Sheet */ +"HockeyFeedbackListCancelOpenLink" = "Cancel"; + +/* Title for the Action Sheet */ +"HockeyFeedbackListOpenLinkInSafari" = "Open Link in Safari"; + /* UIActivity */ /* Activity Sharing Button Title, App Name will be inserted */ diff --git a/Resources/sv.lproj/HockeySDK.strings b/Resources/sv.lproj/HockeySDK.strings index e49649d0c1..ef2361c3d7 100755 --- a/Resources/sv.lproj/HockeySDK.strings +++ b/Resources/sv.lproj/HockeySDK.strings @@ -159,17 +159,11 @@ /* Button title for deleting all local messages*/ "HockeyFeedbackListButonDeleteAllMessages" = "Delete All Messages"; -/* User Name In Message If Name Not Set */ -"HockeyFeedbackListMessageUserNameNotSet" = "You"; - -/* Name In Message From Server If Name Not Set */ -"HockeyFeedbackListMessageResponseNameNotSet" = "Response"; - /* Message pending to be send */ "HockeyFeedbackListMessagePending" = "Pending"; -/* Delete All Messages Action Sheet */ +/* Delete All Messages Action Sheet / Alert View */ /* Title for the Action Sheet */ "HockeyFeedbackListDeleteAllTitle" = "This will delete all messages on this device."; @@ -181,6 +175,14 @@ "HockeyFeedbackListDeleteAllCancel" = "Cancel"; +/* Open Link In Safari Action Sheet / Alert View */ + +/* Title for the Action Sheet */ +"HockeyFeedbackListCancelOpenLink" = "Cancel"; + +/* Title for the Action Sheet */ +"HockeyFeedbackListOpenLinkInSafari" = "Open Link in Safari"; + /* UIActivity */ /* Activity Sharing Button Title, App Name will be inserted */ diff --git a/Resources/tr.lproj/HockeySDK.strings b/Resources/tr.lproj/HockeySDK.strings index 59c489e82e..a76dba2c9b 100644 --- a/Resources/tr.lproj/HockeySDK.strings +++ b/Resources/tr.lproj/HockeySDK.strings @@ -159,17 +159,11 @@ /* Button title for deleting all local messages*/ "HockeyFeedbackListButonDeleteAllMessages" = "Delete All Messages"; -/* User Name In Message If Name Not Set */ -"HockeyFeedbackListMessageUserNameNotSet" = "You"; - -/* Name In Message From Server If Name Not Set */ -"HockeyFeedbackListMessageResponseNameNotSet" = "Response"; - /* Message pending to be send */ "HockeyFeedbackListMessagePending" = "Pending"; -/* Delete All Messages Action Sheet */ +/* Delete All Messages Action Sheet / Alert View */ /* Title for the Action Sheet */ "HockeyFeedbackListDeleteAllTitle" = "This will delete all messages on this device."; @@ -181,6 +175,14 @@ "HockeyFeedbackListDeleteAllCancel" = "Cancel"; +/* Open Link In Safari Action Sheet / Alert View */ + +/* Title for the Action Sheet */ +"HockeyFeedbackListCancelOpenLink" = "Cancel"; + +/* Title for the Action Sheet */ +"HockeyFeedbackListOpenLinkInSafari" = "Open Link in Safari"; + /* UIActivity */ /* Activity Sharing Button Title, App Name will be inserted */ diff --git a/Resources/zh_CN.lproj/HockeySDK.strings b/Resources/zh_CN.lproj/HockeySDK.strings index a2def09f85..b2090e5cee 100644 --- a/Resources/zh_CN.lproj/HockeySDK.strings +++ b/Resources/zh_CN.lproj/HockeySDK.strings @@ -159,17 +159,11 @@ /* Button title for deleting all local messages*/ "HockeyFeedbackListButonDeleteAllMessages" = "Delete All Messages"; -/* User Name In Message If Name Not Set */ -"HockeyFeedbackListMessageUserNameNotSet" = "You"; - -/* Name In Message From Server If Name Not Set */ -"HockeyFeedbackListMessageResponseNameNotSet" = "Response"; - /* Message pending to be send */ "HockeyFeedbackListMessagePending" = "Pending"; -/* Delete All Messages Action Sheet */ +/* Delete All Messages Action Sheet / Alert View */ /* Title for the Action Sheet */ "HockeyFeedbackListDeleteAllTitle" = "This will delete all messages on this device."; @@ -181,6 +175,14 @@ "HockeyFeedbackListDeleteAllCancel" = "Cancel"; +/* Open Link In Safari Action Sheet / Alert View */ + +/* Title for the Action Sheet */ +"HockeyFeedbackListCancelOpenLink" = "Cancel"; + +/* Title for the Action Sheet */ +"HockeyFeedbackListOpenLinkInSafari" = "Open Link in Safari"; + /* UIActivity */ /* Activity Sharing Button Title, App Name will be inserted */ diff --git a/Resources/zh_TW.lproj/HockeySDK.strings b/Resources/zh_TW.lproj/HockeySDK.strings index 1caa729ba9..ee45009bbf 100644 --- a/Resources/zh_TW.lproj/HockeySDK.strings +++ b/Resources/zh_TW.lproj/HockeySDK.strings @@ -159,17 +159,11 @@ /* Button title for deleting all local messages*/ "HockeyFeedbackListButonDeleteAllMessages" = "Delete All Messages"; -/* User Name In Message If Name Not Set */ -"HockeyFeedbackListMessageUserNameNotSet" = "You"; - -/* Name In Message From Server If Name Not Set */ -"HockeyFeedbackListMessageResponseNameNotSet" = "Response"; - /* Message pending to be send */ "HockeyFeedbackListMessagePending" = "Pending"; -/* Delete All Messages Action Sheet */ +/* Delete All Messages Action Sheet / Alert View */ /* Title for the Action Sheet */ "HockeyFeedbackListDeleteAllTitle" = "This will delete all messages on this device."; @@ -181,6 +175,14 @@ "HockeyFeedbackListDeleteAllCancel" = "Cancel"; +/* Open Link In Safari Action Sheet / Alert View */ + +/* Title for the Action Sheet */ +"HockeyFeedbackListCancelOpenLink" = "Cancel"; + +/* Title for the Action Sheet */ +"HockeyFeedbackListOpenLinkInSafari" = "Open Link in Safari"; + /* UIActivity */ /* Activity Sharing Button Title, App Name will be inserted */