keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add accessibilityIdentifiers to conversation settings view.

Browse Source
pull/2/head
Matthew Chen 6 years ago
parent d253c5aa91
commit f073dd9a52
2 changed files with 135 additions and 62 deletions
Show Stats Download Patch File Download Diff File

191
Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
Unescape Escape View File

@ -214,7 +214,8 @@ const CGFloat kIconViewLength = 24;
[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"EDIT_TXT", nil) [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"EDIT_TXT", nil)
style:UIBarButtonItemStylePlain style:UIBarButtonItemStylePlain
target:self target:self
action:@selector(didTapEditButton)]; action:@selector(didTapEditButton)
accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"edit")];
} }
} }
@ -272,6 +273,7 @@ const CGFloat kIconViewLength = 24;
self.tableView.rowHeight = UITableViewAutomaticDimension; self.tableView.rowHeight = UITableViewAutomaticDimension;
_disappearingMessagesDurationLabel = [UILabel new]; _disappearingMessagesDurationLabel = [UILabel new];
SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _disappearingMessagesDurationLabel);
self.disappearingMessagesDurations = [OWSDisappearingMessagesConfiguration validDurationsSeconds]; self.disappearingMessagesDurations = [OWSDisappearingMessagesConfiguration validDurationsSeconds];
@ -323,21 +325,31 @@ const CGFloat kIconViewLength = 24;
if ([self.thread isKindOfClass:[TSContactThread class]] && self.contactsManager.supportsContactEditing if ([self.thread isKindOfClass:[TSContactThread class]] && self.contactsManager.supportsContactEditing
&& !self.hasExistingContact) { && !self.hasExistingContact) {
[mainSection addItem:[OWSTableItem itemWithCustomCellBlock:^{ [mainSection
return addItem:[OWSTableItem
[weakSelf disclosureCellWithName:NSLocalizedString(@"CONVERSATION_SETTINGS_NEW_CONTACT", itemWithCustomCellBlock:^{
@"Label for 'new contact' button in conversation settings view.") return [weakSelf
iconName:@"table_ic_new_contact"]; disclosureCellWithName:
} NSLocalizedString(@"CONVERSATION_SETTINGS_NEW_CONTACT",
actionBlock:^{ @"Label for 'new contact' button in conversation settings view.")
[weakSelf presentContactViewController]; iconName:@"table_ic_new_contact"
}]]; accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(
[mainSection addItem:[OWSTableItem itemWithCustomCellBlock:^{ OWSConversationSettingsViewController, @"new_contact")];
return }
[weakSelf disclosureCellWithName:NSLocalizedString(@"CONVERSATION_SETTINGS_ADD_TO_EXISTING_CONTACT", actionBlock:^{
@"Label for 'new contact' button in conversation settings view.") [weakSelf presentContactViewController];
iconName:@"table_ic_add_to_existing_contact"]; }]];
} [mainSection addItem:[OWSTableItem
itemWithCustomCellBlock:^{
return [weakSelf
disclosureCellWithName:
NSLocalizedString(@"CONVERSATION_SETTINGS_ADD_TO_EXISTING_CONTACT",
@"Label for 'new contact' button in conversation settings view.")
iconName:@"table_ic_add_to_existing_contact"
accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(
OWSConversationSettingsViewController,
@"add_to_existing_contact")];
}
actionBlock:^{ actionBlock:^{
OWSConversationSettingsViewController *strongSelf = weakSelf; OWSConversationSettingsViewController *strongSelf = weakSelf;
OWSCAssertDebug(strongSelf); OWSCAssertDebug(strongSelf);
@ -349,8 +361,11 @@ const CGFloat kIconViewLength = 24;
[mainSection addItem:[OWSTableItem [mainSection addItem:[OWSTableItem
itemWithCustomCellBlock:^{ itemWithCustomCellBlock:^{
return [weakSelf disclosureCellWithName:MediaStrings.allMedia return [weakSelf
iconName:@"actionsheet_camera_roll_black"]; disclosureCellWithName:MediaStrings.allMedia
iconName:@"actionsheet_camera_roll_black"
accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(
OWSConversationSettingsViewController, @"all_media")];
} }
actionBlock:^{ actionBlock:^{
[weakSelf showMediaGallery]; [weakSelf showMediaGallery];
@ -362,24 +377,31 @@ const CGFloat kIconViewLength = 24;
NSString *title = NSLocalizedString(@"CONVERSATION_SETTINGS_SEARCH", NSString *title = NSLocalizedString(@"CONVERSATION_SETTINGS_SEARCH",
@"Table cell label in conversation settings which returns the user to the " @"Table cell label in conversation settings which returns the user to the "
@"conversation with 'search mode' activated"); @"conversation with 'search mode' activated");
return return [weakSelf
[weakSelf disclosureCellWithName:title iconName:@"conversation_settings_search"]; disclosureCellWithName:title
iconName:@"conversation_settings_search"
accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(
OWSConversationSettingsViewController, @"search")];
} }
actionBlock:^{ actionBlock:^{
[weakSelf tappedConversationSearch]; [weakSelf tappedConversationSearch];
}]]; }]];
if (!isNoteToSelf && !self.isGroupThread && self.thread.hasSafetyNumbers) { if (!isNoteToSelf && !self.isGroupThread && self.thread.hasSafetyNumbers) {
[mainSection addItem:[OWSTableItem itemWithCustomCellBlock:^{ [mainSection
return [weakSelf addItem:[OWSTableItem
disclosureCellWithName: itemWithCustomCellBlock:^{
NSLocalizedString(@"VERIFY_PRIVACY", return [weakSelf
@"Label for button or row which allows users to verify the safety number of another user.") disclosureCellWithName:NSLocalizedString(@"VERIFY_PRIVACY",
iconName:@"table_ic_not_verified"]; @"Label for button or row which allows users to verify the "
} @"safety number of another user.")
actionBlock:^{ iconName:@"table_ic_not_verified"
[weakSelf showVerificationView]; accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(
}]]; OWSConversationSettingsViewController, @"safety_numbers")];
}
actionBlock:^{
[weakSelf showVerificationView];
}]];
} }
if (isNoteToSelf) { if (isNoteToSelf) {
@ -392,15 +414,18 @@ const CGFloat kIconViewLength = 24;
OWSCAssertDebug(strongSelf); OWSCAssertDebug(strongSelf);
return [strongSelf return [strongSelf
labelCellWithName: labelCellWithName:
(strongSelf.isGroupThread (strongSelf.isGroupThread
? NSLocalizedString( ? NSLocalizedString(
@"CONVERSATION_SETTINGS_VIEW_PROFILE_IS_SHARED_WITH_GROUP", @"CONVERSATION_SETTINGS_VIEW_PROFILE_IS_SHARED_WITH_GROUP",
@"Indicates that user's profile has been shared with a group.") @"Indicates that user's profile has been shared with a group.")
: NSLocalizedString( : NSLocalizedString(
@"CONVERSATION_SETTINGS_VIEW_PROFILE_IS_SHARED_WITH_USER", @"CONVERSATION_SETTINGS_VIEW_PROFILE_IS_SHARED_WITH_USER",
@"Indicates that user's profile has been shared with a user.")) @"Indicates that user's profile has been shared with a user."))
iconName:@"table_ic_share_profile"]; iconName:@"table_ic_share_profile"
accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(
OWSConversationSettingsViewController,
@"profile_is_shared")];
} }
actionBlock:nil]]; actionBlock:nil]];
} else { } else {
@ -411,13 +436,15 @@ const CGFloat kIconViewLength = 24;
OWSCAssertDebug(strongSelf); OWSCAssertDebug(strongSelf);
UITableViewCell *cell = [strongSelf UITableViewCell *cell = [strongSelf
disclosureCellWithName: disclosureCellWithName:
(strongSelf.isGroupThread (strongSelf.isGroupThread
? NSLocalizedString(@"CONVERSATION_SETTINGS_VIEW_SHARE_PROFILE_WITH_GROUP", ? NSLocalizedString(@"CONVERSATION_SETTINGS_VIEW_SHARE_PROFILE_WITH_GROUP",
@"Action that shares user profile with a group.") @"Action that shares user profile with a group.")
: NSLocalizedString(@"CONVERSATION_SETTINGS_VIEW_SHARE_PROFILE_WITH_USER", : NSLocalizedString(@"CONVERSATION_SETTINGS_VIEW_SHARE_PROFILE_WITH_USER",
@"Action that shares user profile with a user.")) @"Action that shares user profile with a user."))
iconName:@"table_ic_share_profile"]; iconName:@"table_ic_share_profile"
accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(
OWSConversationSettingsViewController, @"share_profile")];
cell.userInteractionEnabled = !strongSelf.hasLeftGroup; cell.userInteractionEnabled = !strongSelf.hasLeftGroup;
return cell; return cell;
@ -476,6 +503,9 @@ const CGFloat kIconViewLength = 24;
cell.userInteractionEnabled = !strongSelf.hasLeftGroup; cell.userInteractionEnabled = !strongSelf.hasLeftGroup;
cell.accessibilityIdentifier = ACCESSIBILITY_IDENTIFIER_WITH_NAME(
OWSConversationSettingsViewController, @"disappearing_messages");
return cell; return cell;
} }
customRowHeight:UITableViewAutomaticDimension customRowHeight:UITableViewAutomaticDimension
@ -524,6 +554,9 @@ const CGFloat kIconViewLength = 24;
cell.userInteractionEnabled = !strongSelf.hasLeftGroup; cell.userInteractionEnabled = !strongSelf.hasLeftGroup;
cell.accessibilityIdentifier = ACCESSIBILITY_IDENTIFIER_WITH_NAME(
OWSConversationSettingsViewController, @"disappearing_messages_duration");
return cell; return cell;
} }
customRowHeight:UITableViewAutomaticDimension customRowHeight:UITableViewAutomaticDimension
@ -541,9 +574,12 @@ const CGFloat kIconViewLength = 24;
[OWSConversationColor conversationColorOrDefaultForColorName:colorName].themeColor; [OWSConversationColor conversationColorOrDefaultForColorName:colorName].themeColor;
NSString *title = NSLocalizedString(@"CONVERSATION_SETTINGS_CONVERSATION_COLOR", NSString *title = NSLocalizedString(@"CONVERSATION_SETTINGS_CONVERSATION_COLOR",
@"Label for table cell which leads to picking a new conversation color"); @"Label for table cell which leads to picking a new conversation color");
return [strongSelf cellWithName:title return [strongSelf
iconName:@"ic_color_palette" cellWithName:title
disclosureIconColor:currentColor]; iconName:@"ic_color_palette"
disclosureIconColor:currentColor
accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(
OWSConversationSettingsViewController, @"conversation_color")];
} }
actionBlock:^{ actionBlock:^{
[weakSelf showColorPicker]; [weakSelf showColorPicker];
@ -561,7 +597,9 @@ const CGFloat kIconViewLength = 24;
UITableViewCell *cell = UITableViewCell *cell =
[weakSelf disclosureCellWithName:NSLocalizedString(@"EDIT_GROUP_ACTION", [weakSelf disclosureCellWithName:NSLocalizedString(@"EDIT_GROUP_ACTION",
@"table cell label in conversation settings") @"table cell label in conversation settings")
iconName:@"table_ic_group_edit"]; iconName:@"table_ic_group_edit"
accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(
OWSConversationSettingsViewController, @"edit_group")];
cell.userInteractionEnabled = !weakSelf.hasLeftGroup; cell.userInteractionEnabled = !weakSelf.hasLeftGroup;
return cell; return cell;
} }
@ -573,7 +611,9 @@ const CGFloat kIconViewLength = 24;
UITableViewCell *cell = UITableViewCell *cell =
[weakSelf disclosureCellWithName:NSLocalizedString(@"LIST_GROUP_MEMBERS_ACTION", [weakSelf disclosureCellWithName:NSLocalizedString(@"LIST_GROUP_MEMBERS_ACTION",
@"table cell label in conversation settings") @"table cell label in conversation settings")
iconName:@"table_ic_group_members"]; iconName:@"table_ic_group_members"
accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(
OWSConversationSettingsViewController, @"group_members")];
cell.userInteractionEnabled = !weakSelf.hasLeftGroup; cell.userInteractionEnabled = !weakSelf.hasLeftGroup;
return cell; return cell;
} }
@ -585,7 +625,9 @@ const CGFloat kIconViewLength = 24;
UITableViewCell *cell = UITableViewCell *cell =
[weakSelf disclosureCellWithName:NSLocalizedString(@"LEAVE_GROUP_ACTION", [weakSelf disclosureCellWithName:NSLocalizedString(@"LEAVE_GROUP_ACTION",
@"table cell label in conversation settings") @"table cell label in conversation settings")
iconName:@"table_ic_group_leave"]; iconName:@"table_ic_group_leave"
accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(
OWSConversationSettingsViewController, @"leave_group")];
cell.userInteractionEnabled = !weakSelf.hasLeftGroup; cell.userInteractionEnabled = !weakSelf.hasLeftGroup;
return cell; return cell;
@ -638,6 +680,10 @@ const CGFloat kIconViewLength = 24;
OWSSound sound = [OWSSounds notificationSoundForThread:strongSelf.thread]; OWSSound sound = [OWSSounds notificationSoundForThread:strongSelf.thread];
cell.detailTextLabel.text = [OWSSounds displayNameForSound:sound]; cell.detailTextLabel.text = [OWSSounds displayNameForSound:sound];
cell.accessibilityIdentifier = ACCESSIBILITY_IDENTIFIER_WITH_NAME(
OWSConversationSettingsViewController, @"notifications");
return cell; return cell;
} }
customRowHeight:UITableViewAutomaticDimension customRowHeight:UITableViewAutomaticDimension
@ -706,6 +752,10 @@ const CGFloat kIconViewLength = 24;
[contentRow autoPinEdgesToSuperviewMargins]; [contentRow autoPinEdgesToSuperviewMargins];
cell.detailTextLabel.text = muteStatus; cell.detailTextLabel.text = muteStatus;
cell.accessibilityIdentifier
= ACCESSIBILITY_IDENTIFIER_WITH_NAME(OWSConversationSettingsViewController, @"mute");
return cell; return cell;
} }
customRowHeight:UITableViewAutomaticDimension customRowHeight:UITableViewAutomaticDimension
@ -743,8 +793,11 @@ const CGFloat kIconViewLength = 24;
cellTitle = NSLocalizedString(@"CONVERSATION_SETTINGS_BLOCK_THIS_USER", cellTitle = NSLocalizedString(@"CONVERSATION_SETTINGS_BLOCK_THIS_USER",
@"table cell label in conversation settings"); @"table cell label in conversation settings");
} }
UITableViewCell *cell = UITableViewCell *cell = [strongSelf
[strongSelf disclosureCellWithName:cellTitle iconName:@"table_ic_block"]; disclosureCellWithName:cellTitle
iconName:@"table_ic_block"
accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(
OWSConversationSettingsViewController, @"block")];
cell.selectionStyle = UITableViewCellSelectionStyleNone; cell.selectionStyle = UITableViewCellSelectionStyleNone;
@ -755,6 +808,7 @@ const CGFloat kIconViewLength = 24;
action:@selector(blockConversationSwitchDidChange:) action:@selector(blockConversationSwitchDidChange:)
forControlEvents:UIControlEventValueChanged]; forControlEvents:UIControlEventValueChanged];
cell.accessoryView = blockConversationSwitch; cell.accessoryView = blockConversationSwitch;
return cell; return cell;
} }
actionBlock:nil]]; actionBlock:nil]];
@ -812,17 +866,23 @@ const CGFloat kIconViewLength = 24;
return cell; return cell;
} }
- (UITableViewCell *)disclosureCellWithName:(NSString *)name iconName:(NSString *)iconName - (UITableViewCell *)disclosureCellWithName:(NSString *)name
iconName:(NSString *)iconName
accessibilityIdentifier:(NSString *)accessibilityIdentifier
{ {
UITableViewCell *cell = [self cellWithName:name iconName:iconName]; UITableViewCell *cell = [self cellWithName:name iconName:iconName];
cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
cell.accessibilityIdentifier = accessibilityIdentifier;
return cell; return cell;
} }
- (UITableViewCell *)labelCellWithName:(NSString *)name iconName:(NSString *)iconName - (UITableViewCell *)labelCellWithName:(NSString *)name
iconName:(NSString *)iconName
accessibilityIdentifier:(NSString *)accessibilityIdentifier
{ {
UITableViewCell *cell = [self cellWithName:name iconName:iconName]; UITableViewCell *cell = [self cellWithName:name iconName:iconName];
cell.accessoryType = UITableViewCellAccessoryNone; cell.accessoryType = UITableViewCellAccessoryNone;
cell.accessibilityIdentifier = accessibilityIdentifier;
return cell; return cell;
} }
@ -916,6 +976,8 @@ const CGFloat kIconViewLength = 24;
action:@selector(conversationNameTouched:)]]; action:@selector(conversationNameTouched:)]];
mainSectionHeader.userInteractionEnabled = YES; mainSectionHeader.userInteractionEnabled = YES;
SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, mainSectionHeader);
return mainSectionHeader; return mainSectionHeader;
} }
@ -1084,11 +1146,12 @@ const CGFloat kIconViewLength = 24;
preferredStyle:UIAlertControllerStyleAlert]; preferredStyle:UIAlertControllerStyleAlert];
UIAlertAction *leaveAction = [UIAlertAction UIAlertAction *leaveAction = [UIAlertAction
actionWithTitle:NSLocalizedString(@"LEAVE_BUTTON_TITLE", @"Confirmation button within contextual alert") actionWithTitle:NSLocalizedString(@"LEAVE_BUTTON_TITLE", @"Confirmation button within contextual alert")
style:UIAlertActionStyleDestructive accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"leave_group_confirm")
handler:^(UIAlertAction *_Nonnull action) { style:UIAlertActionStyleDestructive
[self leaveGroup]; handler:^(UIAlertAction *_Nonnull action) {
}]; [self leaveGroup];
}];
[alert addAction:leaveAction]; [alert addAction:leaveAction];
[alert addAction:[OWSAlerts cancelAction]]; [alert addAction:[OWSAlerts cancelAction]];
@ -1228,6 +1291,7 @@ const CGFloat kIconViewLength = 24;
if (self.thread.isMuted) { if (self.thread.isMuted) {
UIAlertAction *action = [UIAlertAction actionWithTitle:NSLocalizedString(@"CONVERSATION_SETTINGS_UNMUTE_ACTION", UIAlertAction *action = [UIAlertAction actionWithTitle:NSLocalizedString(@"CONVERSATION_SETTINGS_UNMUTE_ACTION",
@"Label for button to unmute a thread.") @"Label for button to unmute a thread.")
accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"unmute")
style:UIAlertActionStyleDestructive style:UIAlertActionStyleDestructive
handler:^(UIAlertAction *_Nonnull ignore) { handler:^(UIAlertAction *_Nonnull ignore) {
[weakSelf setThreadMutedUntilDate:nil]; [weakSelf setThreadMutedUntilDate:nil];
@ -1238,6 +1302,7 @@ const CGFloat kIconViewLength = 24;
[actionSheet [actionSheet
addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"CONVERSATION_SETTINGS_MUTE_ONE_MINUTE_ACTION", addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"CONVERSATION_SETTINGS_MUTE_ONE_MINUTE_ACTION",
@"Label for button to mute a thread for a minute.") @"Label for button to mute a thread for a minute.")
accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"mute_1_minute")
style:UIAlertActionStyleDestructive style:UIAlertActionStyleDestructive
handler:^(UIAlertAction *_Nonnull ignore) { handler:^(UIAlertAction *_Nonnull ignore) {
NSTimeZone *timeZone = [NSTimeZone timeZoneWithName:@"UTC"]; NSTimeZone *timeZone = [NSTimeZone timeZoneWithName:@"UTC"];
@ -1255,6 +1320,7 @@ const CGFloat kIconViewLength = 24;
[actionSheet [actionSheet
addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"CONVERSATION_SETTINGS_MUTE_ONE_HOUR_ACTION", addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"CONVERSATION_SETTINGS_MUTE_ONE_HOUR_ACTION",
@"Label for button to mute a thread for a hour.") @"Label for button to mute a thread for a hour.")
accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"mute_1_hour")
style:UIAlertActionStyleDestructive style:UIAlertActionStyleDestructive
handler:^(UIAlertAction *_Nonnull ignore) { handler:^(UIAlertAction *_Nonnull ignore) {
NSTimeZone *timeZone = [NSTimeZone timeZoneWithName:@"UTC"]; NSTimeZone *timeZone = [NSTimeZone timeZoneWithName:@"UTC"];
@ -1271,6 +1337,7 @@ const CGFloat kIconViewLength = 24;
[actionSheet [actionSheet
addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"CONVERSATION_SETTINGS_MUTE_ONE_DAY_ACTION", addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"CONVERSATION_SETTINGS_MUTE_ONE_DAY_ACTION",
@"Label for button to mute a thread for a day.") @"Label for button to mute a thread for a day.")
accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"mute_1_day")
style:UIAlertActionStyleDestructive style:UIAlertActionStyleDestructive
handler:^(UIAlertAction *_Nonnull ignore) { handler:^(UIAlertAction *_Nonnull ignore) {
NSTimeZone *timeZone = [NSTimeZone timeZoneWithName:@"UTC"]; NSTimeZone *timeZone = [NSTimeZone timeZoneWithName:@"UTC"];
@ -1287,6 +1354,7 @@ const CGFloat kIconViewLength = 24;
[actionSheet [actionSheet
addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"CONVERSATION_SETTINGS_MUTE_ONE_WEEK_ACTION", addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"CONVERSATION_SETTINGS_MUTE_ONE_WEEK_ACTION",
@"Label for button to mute a thread for a week.") @"Label for button to mute a thread for a week.")
accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"mute_1_week")
style:UIAlertActionStyleDestructive style:UIAlertActionStyleDestructive
handler:^(UIAlertAction *_Nonnull ignore) { handler:^(UIAlertAction *_Nonnull ignore) {
NSTimeZone *timeZone = [NSTimeZone timeZoneWithName:@"UTC"]; NSTimeZone *timeZone = [NSTimeZone timeZoneWithName:@"UTC"];
@ -1303,6 +1371,7 @@ const CGFloat kIconViewLength = 24;
[actionSheet [actionSheet
addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"CONVERSATION_SETTINGS_MUTE_ONE_YEAR_ACTION", addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"CONVERSATION_SETTINGS_MUTE_ONE_YEAR_ACTION",
@"Label for button to mute a thread for a year.") @"Label for button to mute a thread for a year.")
accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"mute_1_year")
style:UIAlertActionStyleDestructive style:UIAlertActionStyleDestructive
handler:^(UIAlertAction *_Nonnull ignore) { handler:^(UIAlertAction *_Nonnull ignore) {
NSTimeZone *timeZone = [NSTimeZone timeZoneWithName:@"UTC"]; NSTimeZone *timeZone = [NSTimeZone timeZoneWithName:@"UTC"];

6
SignalMessaging/categories/UIViewController+OWS.m
Unescape Escape View File

@ -4,9 +4,11 @@
#import "Theme.h" #import "Theme.h"
#import "UIColor+OWS.h" #import "UIColor+OWS.h"
#import "UIUtil.h"
#import "UIView+OWS.h" #import "UIView+OWS.h"
#import "UIViewController+OWS.h" #import "UIViewController+OWS.h"
#import <SignalCoreKit/iOSVersions.h> #import <SignalCoreKit/iOSVersions.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalServiceKit/AppContext.h> #import <SignalServiceKit/AppContext.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@ -120,7 +122,9 @@ NS_ASSUME_NONNULL_BEGIN
action:selector]; action:selector];
} }
UIBarButtonItem *backItem = [[UIBarButtonItem alloc] initWithCustomView:backButton]; UIBarButtonItem *backItem =
[[UIBarButtonItem alloc] initWithCustomView:backButton
accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"back")];
backItem.width = buttonFrame.size.width; backItem.width = buttonFrame.size.width;
return backItem; return backItem;

Write Preview
Loading…
Cancel
Save