diff --git a/Signal/Images.xcassets/table_ic_block.imageset/table_ic_block@1x.png b/Signal/Images.xcassets/table_ic_block.imageset/table_ic_block@1x.png index 2c874458b..d9fd17d1b 100644 Binary files a/Signal/Images.xcassets/table_ic_block.imageset/table_ic_block@1x.png and b/Signal/Images.xcassets/table_ic_block.imageset/table_ic_block@1x.png differ diff --git a/Signal/Images.xcassets/table_ic_block.imageset/table_ic_block@2x.png b/Signal/Images.xcassets/table_ic_block.imageset/table_ic_block@2x.png index 66d61f3ba..8ba80069d 100644 Binary files a/Signal/Images.xcassets/table_ic_block.imageset/table_ic_block@2x.png and b/Signal/Images.xcassets/table_ic_block.imageset/table_ic_block@2x.png differ diff --git a/Signal/Images.xcassets/table_ic_block.imageset/table_ic_block@3x.png b/Signal/Images.xcassets/table_ic_block.imageset/table_ic_block@3x.png index 8a225841c..680fad7c1 100644 Binary files a/Signal/Images.xcassets/table_ic_block.imageset/table_ic_block@3x.png and b/Signal/Images.xcassets/table_ic_block.imageset/table_ic_block@3x.png differ diff --git a/Signal/Images.xcassets/table_ic_group_edit.imageset/Contents.json b/Signal/Images.xcassets/table_ic_group_edit.imageset/Contents.json new file mode 100644 index 000000000..d8b2f7c32 --- /dev/null +++ b/Signal/Images.xcassets/table_ic_group_edit.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "table_ic_group_edit@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "table_ic_group_edit@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "table_ic_group_edit@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/table_ic_group_edit.imageset/table_ic_group_edit@1x.png b/Signal/Images.xcassets/table_ic_group_edit.imageset/table_ic_group_edit@1x.png new file mode 100644 index 000000000..9c41861e0 Binary files /dev/null and b/Signal/Images.xcassets/table_ic_group_edit.imageset/table_ic_group_edit@1x.png differ diff --git a/Signal/Images.xcassets/table_ic_group_edit.imageset/table_ic_group_edit@2x.png b/Signal/Images.xcassets/table_ic_group_edit.imageset/table_ic_group_edit@2x.png new file mode 100644 index 000000000..a2cfa0455 Binary files /dev/null and b/Signal/Images.xcassets/table_ic_group_edit.imageset/table_ic_group_edit@2x.png differ diff --git a/Signal/Images.xcassets/table_ic_group_edit.imageset/table_ic_group_edit@3x.png b/Signal/Images.xcassets/table_ic_group_edit.imageset/table_ic_group_edit@3x.png new file mode 100644 index 000000000..0adfd03f9 Binary files /dev/null and b/Signal/Images.xcassets/table_ic_group_edit.imageset/table_ic_group_edit@3x.png differ diff --git a/Signal/Images.xcassets/table_ic_group_leave.imageset/Contents.json b/Signal/Images.xcassets/table_ic_group_leave.imageset/Contents.json new file mode 100644 index 000000000..eb9c6e487 --- /dev/null +++ b/Signal/Images.xcassets/table_ic_group_leave.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "table_ic_group_leave@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "table_ic_group_leave@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "table_ic_group_leave@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/table_ic_group_leave.imageset/table_ic_group_leave@1x.png b/Signal/Images.xcassets/table_ic_group_leave.imageset/table_ic_group_leave@1x.png new file mode 100644 index 000000000..16b2f3a5a Binary files /dev/null and b/Signal/Images.xcassets/table_ic_group_leave.imageset/table_ic_group_leave@1x.png differ diff --git a/Signal/Images.xcassets/table_ic_group_leave.imageset/table_ic_group_leave@2x.png b/Signal/Images.xcassets/table_ic_group_leave.imageset/table_ic_group_leave@2x.png new file mode 100644 index 000000000..37461a486 Binary files /dev/null and b/Signal/Images.xcassets/table_ic_group_leave.imageset/table_ic_group_leave@2x.png differ diff --git a/Signal/Images.xcassets/table_ic_group_leave.imageset/table_ic_group_leave@3x.png b/Signal/Images.xcassets/table_ic_group_leave.imageset/table_ic_group_leave@3x.png new file mode 100644 index 000000000..f1f4a6cc8 Binary files /dev/null and b/Signal/Images.xcassets/table_ic_group_leave.imageset/table_ic_group_leave@3x.png differ diff --git a/Signal/Images.xcassets/table_ic_group_members.imageset/Contents.json b/Signal/Images.xcassets/table_ic_group_members.imageset/Contents.json new file mode 100644 index 000000000..eea494df7 --- /dev/null +++ b/Signal/Images.xcassets/table_ic_group_members.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "table_ic_group_members@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "table_ic_group_members@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "table_ic_group_members@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/table_ic_group_members.imageset/table_ic_group_members@1x.png b/Signal/Images.xcassets/table_ic_group_members.imageset/table_ic_group_members@1x.png new file mode 100644 index 000000000..1545cdd54 Binary files /dev/null and b/Signal/Images.xcassets/table_ic_group_members.imageset/table_ic_group_members@1x.png differ diff --git a/Signal/Images.xcassets/table_ic_group_members.imageset/table_ic_group_members@2x.png b/Signal/Images.xcassets/table_ic_group_members.imageset/table_ic_group_members@2x.png new file mode 100644 index 000000000..eeb96cc21 Binary files /dev/null and b/Signal/Images.xcassets/table_ic_group_members.imageset/table_ic_group_members@2x.png differ diff --git a/Signal/Images.xcassets/table_ic_group_members.imageset/table_ic_group_members@3x.png b/Signal/Images.xcassets/table_ic_group_members.imageset/table_ic_group_members@3x.png new file mode 100644 index 000000000..3da10ef6d Binary files /dev/null and b/Signal/Images.xcassets/table_ic_group_members.imageset/table_ic_group_members@3x.png differ diff --git a/Signal/Images.xcassets/table_ic_timer.imageset/Contents.json b/Signal/Images.xcassets/table_ic_hourglass.imageset/Contents.json similarity index 100% rename from Signal/Images.xcassets/table_ic_timer.imageset/Contents.json rename to Signal/Images.xcassets/table_ic_hourglass.imageset/Contents.json diff --git a/Signal/Images.xcassets/table_ic_timer.imageset/table_ic_timer@1x.png b/Signal/Images.xcassets/table_ic_hourglass.imageset/table_ic_timer@1x.png similarity index 100% rename from Signal/Images.xcassets/table_ic_timer.imageset/table_ic_timer@1x.png rename to Signal/Images.xcassets/table_ic_hourglass.imageset/table_ic_timer@1x.png diff --git a/Signal/Images.xcassets/table_ic_timer.imageset/table_ic_timer@2x.png b/Signal/Images.xcassets/table_ic_hourglass.imageset/table_ic_timer@2x.png similarity index 100% rename from Signal/Images.xcassets/table_ic_timer.imageset/table_ic_timer@2x.png rename to Signal/Images.xcassets/table_ic_hourglass.imageset/table_ic_timer@2x.png diff --git a/Signal/Images.xcassets/table_ic_timer.imageset/table_ic_timer@3x.png b/Signal/Images.xcassets/table_ic_hourglass.imageset/table_ic_timer@3x.png similarity index 100% rename from Signal/Images.xcassets/table_ic_timer.imageset/table_ic_timer@3x.png rename to Signal/Images.xcassets/table_ic_hourglass.imageset/table_ic_timer@3x.png diff --git a/Signal/Images.xcassets/table_ic_hourglass_empty.imageset/Contents.json b/Signal/Images.xcassets/table_ic_hourglass_empty.imageset/Contents.json index 75efc1692..b516838aa 100644 --- a/Signal/Images.xcassets/table_ic_hourglass_empty.imageset/Contents.json +++ b/Signal/Images.xcassets/table_ic_hourglass_empty.imageset/Contents.json @@ -2,7 +2,7 @@ "images" : [ { "idiom" : "universal", - "filename" : "table_ic_hourglass_empty.png", + "filename" : "table_ic_hourglass_empty@1x.png", "scale" : "1x" }, { diff --git a/Signal/Images.xcassets/table_ic_hourglass_empty.imageset/table_ic_hourglass_empty.png b/Signal/Images.xcassets/table_ic_hourglass_empty.imageset/table_ic_hourglass_empty.png deleted file mode 100644 index 587836747..000000000 Binary files a/Signal/Images.xcassets/table_ic_hourglass_empty.imageset/table_ic_hourglass_empty.png and /dev/null differ diff --git a/Signal/Images.xcassets/table_ic_hourglass_empty.imageset/table_ic_hourglass_empty@1x.png b/Signal/Images.xcassets/table_ic_hourglass_empty.imageset/table_ic_hourglass_empty@1x.png new file mode 100644 index 000000000..078b58fbb Binary files /dev/null and b/Signal/Images.xcassets/table_ic_hourglass_empty.imageset/table_ic_hourglass_empty@1x.png differ diff --git a/Signal/Images.xcassets/table_ic_hourglass_empty.imageset/table_ic_hourglass_empty@2x.png b/Signal/Images.xcassets/table_ic_hourglass_empty.imageset/table_ic_hourglass_empty@2x.png index 5e29696f9..48c0488b3 100644 Binary files a/Signal/Images.xcassets/table_ic_hourglass_empty.imageset/table_ic_hourglass_empty@2x.png and b/Signal/Images.xcassets/table_ic_hourglass_empty.imageset/table_ic_hourglass_empty@2x.png differ diff --git a/Signal/Images.xcassets/table_ic_hourglass_empty.imageset/table_ic_hourglass_empty@3x.png b/Signal/Images.xcassets/table_ic_hourglass_empty.imageset/table_ic_hourglass_empty@3x.png index ac1d6cf91..542febeca 100644 Binary files a/Signal/Images.xcassets/table_ic_hourglass_empty.imageset/table_ic_hourglass_empty@3x.png and b/Signal/Images.xcassets/table_ic_hourglass_empty.imageset/table_ic_hourglass_empty@3x.png differ diff --git a/Signal/Images.xcassets/table_ic_lock_outline.imageset/Contents.json b/Signal/Images.xcassets/table_ic_lock_outline.imageset/Contents.json new file mode 100644 index 000000000..215c3d6b1 --- /dev/null +++ b/Signal/Images.xcassets/table_ic_lock_outline.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "table_ic_lock_outline@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "table_ic_lock_outline@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "table_ic_lock_outline@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/table_ic_lock_outline.imageset/table_ic_lock_outline@1x.png b/Signal/Images.xcassets/table_ic_lock_outline.imageset/table_ic_lock_outline@1x.png new file mode 100644 index 000000000..cfb7999ef Binary files /dev/null and b/Signal/Images.xcassets/table_ic_lock_outline.imageset/table_ic_lock_outline@1x.png differ diff --git a/Signal/Images.xcassets/table_ic_lock_outline.imageset/table_ic_lock_outline@2x.png b/Signal/Images.xcassets/table_ic_lock_outline.imageset/table_ic_lock_outline@2x.png new file mode 100644 index 000000000..ef9fa516c Binary files /dev/null and b/Signal/Images.xcassets/table_ic_lock_outline.imageset/table_ic_lock_outline@2x.png differ diff --git a/Signal/Images.xcassets/table_ic_lock_outline.imageset/table_ic_lock_outline@3x.png b/Signal/Images.xcassets/table_ic_lock_outline.imageset/table_ic_lock_outline@3x.png new file mode 100644 index 000000000..83451545c Binary files /dev/null and b/Signal/Images.xcassets/table_ic_lock_outline.imageset/table_ic_lock_outline@3x.png differ diff --git a/Signal/Images.xcassets/table_ic_mute_thread.imageset/Contents.json b/Signal/Images.xcassets/table_ic_mute_thread.imageset/Contents.json new file mode 100644 index 000000000..ee1870af4 --- /dev/null +++ b/Signal/Images.xcassets/table_ic_mute_thread.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "table_ic_mute_thread@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "table_ic_mute_thread@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "table_ic_mute_thread@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/table_ic_mute_thread.imageset/table_ic_mute_thread@1x.png b/Signal/Images.xcassets/table_ic_mute_thread.imageset/table_ic_mute_thread@1x.png new file mode 100644 index 000000000..5a8efa05b Binary files /dev/null and b/Signal/Images.xcassets/table_ic_mute_thread.imageset/table_ic_mute_thread@1x.png differ diff --git a/Signal/Images.xcassets/table_ic_mute_thread.imageset/table_ic_mute_thread@2x.png b/Signal/Images.xcassets/table_ic_mute_thread.imageset/table_ic_mute_thread@2x.png new file mode 100644 index 000000000..412a40ce1 Binary files /dev/null and b/Signal/Images.xcassets/table_ic_mute_thread.imageset/table_ic_mute_thread@2x.png differ diff --git a/Signal/Images.xcassets/table_ic_mute_thread.imageset/table_ic_mute_thread@3x.png b/Signal/Images.xcassets/table_ic_mute_thread.imageset/table_ic_mute_thread@3x.png new file mode 100644 index 000000000..e4a1a9d49 Binary files /dev/null and b/Signal/Images.xcassets/table_ic_mute_thread.imageset/table_ic_mute_thread@3x.png differ diff --git a/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m b/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m index dd3611e4b..cf06204bf 100644 --- a/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m +++ b/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m @@ -218,7 +218,7 @@ NS_ASSUME_NONNULL_BEGIN UITableViewCell *cell = [UITableViewCell new]; cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; - UIImageView *iconView = [self viewForIconWithName:@"ic_lock_outline"]; + UIImageView *iconView = [self viewForIconWithName:@"table_ic_lock_outline"]; [cell.contentView addSubview:iconView]; [iconView autoVCenterInSuperview]; [iconView autoPinEdgeToSuperviewEdge:ALEdgeLeft withInset:16.f]; @@ -230,7 +230,7 @@ NS_ASSUME_NONNULL_BEGIN rowLabel.lineBreakMode = NSLineBreakByTruncatingTail; [cell.contentView addSubview:rowLabel]; [rowLabel autoVCenterInSuperview]; - [rowLabel autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:iconView withOffset:16.f]; + [rowLabel autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:iconView withOffset:12.f]; return cell; } @@ -268,7 +268,7 @@ NS_ASSUME_NONNULL_BEGIN [topView autoPinEdgeToSuperviewEdge:ALEdgeTop]; [topView autoSetDimension:ALDimensionHeight toSize:kOWSTable_DefaultCellHeight]; - UIImageView *iconView = [self viewForIconWithName:@"table_ic_timer"]; + UIImageView *iconView = [self viewForIconWithName:@"table_ic_hourglass"]; [topView addSubview:iconView]; [iconView autoVCenterInSuperview]; [iconView autoPinEdgeToSuperviewEdge:ALEdgeLeft withInset:16.f]; @@ -280,7 +280,7 @@ NS_ASSUME_NONNULL_BEGIN rowLabel.lineBreakMode = NSLineBreakByTruncatingTail; [topView addSubview:rowLabel]; [rowLabel autoVCenterInSuperview]; - [rowLabel autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:iconView withOffset:16.f]; + [rowLabel autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:iconView withOffset:12.f]; UISwitch *switchView = [UISwitch new]; switchView.on = self.disappearingMessagesConfiguration.isEnabled; @@ -334,7 +334,7 @@ NS_ASSUME_NONNULL_BEGIN rowLabel.lineBreakMode = NSLineBreakByTruncatingTail; [topView addSubview:rowLabel]; [rowLabel autoVCenterInSuperview]; - [rowLabel autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:iconView withOffset:16.f]; + [rowLabel autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:iconView withOffset:12.f]; UISlider *slider = [UISlider new]; slider.maximumValue = (float)(self.disappearingMessagesDurations.count - 1); @@ -364,12 +364,22 @@ NS_ASSUME_NONNULL_BEGIN NSArray *groupItems = @[ [OWSTableItem itemWithCustomCellBlock:^{ UITableViewCell *cell = [UITableViewCell new]; - cell.textLabel.text - = NSLocalizedString(@"EDIT_GROUP_ACTION", @"table cell label in conversation settings"); - cell.textLabel.textColor = [UIColor blackColor]; - cell.textLabel.font = [UIFont ows_regularFontWithSize:17.f]; - cell.textLabel.lineBreakMode = NSLineBreakByTruncatingTail; cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; + + UIImageView *iconView = [self viewForIconWithName:@"table_ic_group_edit"]; + [cell.contentView addSubview:iconView]; + [iconView autoVCenterInSuperview]; + [iconView autoPinEdgeToSuperviewEdge:ALEdgeLeft withInset:16.f]; + + UILabel *rowLabel = [UILabel new]; + rowLabel.text = NSLocalizedString(@"EDIT_GROUP_ACTION", @"table cell label in conversation settings"); + rowLabel.textColor = [UIColor blackColor]; + rowLabel.font = [UIFont ows_regularFontWithSize:17.f]; + rowLabel.lineBreakMode = NSLineBreakByTruncatingTail; + [cell.contentView addSubview:rowLabel]; + [rowLabel autoVCenterInSuperview]; + [rowLabel autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:iconView withOffset:12.f]; + return cell; } actionBlock:^{ @@ -377,25 +387,23 @@ NS_ASSUME_NONNULL_BEGIN }], [OWSTableItem itemWithCustomCellBlock:^{ UITableViewCell *cell = [UITableViewCell new]; - cell.textLabel.text - = NSLocalizedString(@"LEAVE_GROUP_ACTION", @"table cell label in conversation settings"); - cell.textLabel.textColor = [UIColor blackColor]; - cell.textLabel.font = [UIFont ows_regularFontWithSize:17.f]; - cell.textLabel.lineBreakMode = NSLineBreakByTruncatingTail; cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; - return cell; - } - actionBlock:^{ - [weakSelf didTapLeaveGroup]; - }], - [OWSTableItem itemWithCustomCellBlock:^{ - UITableViewCell *cell = [UITableViewCell new]; - cell.textLabel.text + + UIImageView *iconView = [self viewForIconWithName:@"table_ic_group_members"]; + [cell.contentView addSubview:iconView]; + [iconView autoVCenterInSuperview]; + [iconView autoPinEdgeToSuperviewEdge:ALEdgeLeft withInset:16.f]; + + UILabel *rowLabel = [UILabel new]; + rowLabel.text = NSLocalizedString(@"LIST_GROUP_MEMBERS_ACTION", @"table cell label in conversation settings"); - cell.textLabel.textColor = [UIColor blackColor]; - cell.textLabel.font = [UIFont ows_regularFontWithSize:17.f]; - cell.textLabel.lineBreakMode = NSLineBreakByTruncatingTail; - cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; + rowLabel.textColor = [UIColor blackColor]; + rowLabel.font = [UIFont ows_regularFontWithSize:17.f]; + rowLabel.lineBreakMode = NSLineBreakByTruncatingTail; + [cell.contentView addSubview:rowLabel]; + [rowLabel autoVCenterInSuperview]; + [rowLabel autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:iconView withOffset:12.f]; + return cell; } actionBlock:^{ @@ -408,6 +416,29 @@ NS_ASSUME_NONNULL_BEGIN [showGroupMembersViewController configWithThread:(TSGroupThread *)strongSelf.thread]; [strongSelf.navigationController pushViewController:showGroupMembersViewController animated:YES]; }], + [OWSTableItem itemWithCustomCellBlock:^{ + UITableViewCell *cell = [UITableViewCell new]; + cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; + + UIImageView *iconView = [self viewForIconWithName:@"table_ic_group_leave"]; + [cell.contentView addSubview:iconView]; + [iconView autoVCenterInSuperview]; + [iconView autoPinEdgeToSuperviewEdge:ALEdgeLeft withInset:16.f]; + + UILabel *rowLabel = [UILabel new]; + rowLabel.text = NSLocalizedString(@"LEAVE_GROUP_ACTION", @"table cell label in conversation settings"); + rowLabel.textColor = [UIColor blackColor]; + rowLabel.font = [UIFont ows_regularFontWithSize:17.f]; + rowLabel.lineBreakMode = NSLineBreakByTruncatingTail; + [cell.contentView addSubview:rowLabel]; + [rowLabel autoVCenterInSuperview]; + [rowLabel autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:iconView withOffset:12.f]; + + return cell; + } + actionBlock:^{ + [weakSelf didTapLeaveGroup]; + }], ]; [contents addSection:[OWSTableSection sectionWithTitle:NSLocalizedString(@"GROUP_MANAGEMENT_SECTION", @@ -422,7 +453,7 @@ NS_ASSUME_NONNULL_BEGIN UITableViewCell *cell = [UITableViewCell new]; cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; - UIImageView *iconView = [self viewForIconWithName:@"ic_mute_thread"]; + UIImageView *iconView = [self viewForIconWithName:@"table_ic_mute_thread"]; [cell.contentView addSubview:iconView]; [iconView autoVCenterInSuperview]; [iconView autoPinEdgeToSuperviewEdge:ALEdgeLeft withInset:16.f]; @@ -435,7 +466,7 @@ NS_ASSUME_NONNULL_BEGIN rowLabel.lineBreakMode = NSLineBreakByTruncatingTail; [cell.contentView addSubview:rowLabel]; [rowLabel autoVCenterInSuperview]; - [rowLabel autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:iconView withOffset:16.f]; + [rowLabel autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:iconView withOffset:12.f]; NSString *muteStatus = NSLocalizedString( @"CONVERSATION_SETTINGS_MUTE_NOT_MUTED", @"Indicates that the current thread is not muted."); @@ -490,7 +521,7 @@ NS_ASSUME_NONNULL_BEGIN UITableViewCell *cell = [UITableViewCell new]; cell.selectionStyle = UITableViewCellSelectionStyleNone; - UIImageView *iconView = [self viewForIconWithName:@"ic_block"]; + UIImageView *iconView = [self viewForIconWithName:@"table_ic_block"]; [cell.contentView addSubview:iconView]; [iconView autoVCenterInSuperview]; [iconView autoPinEdgeToSuperviewEdge:ALEdgeLeft withInset:16.f]; @@ -503,7 +534,7 @@ NS_ASSUME_NONNULL_BEGIN rowLabel.lineBreakMode = NSLineBreakByTruncatingTail; [cell.contentView addSubview:rowLabel]; [rowLabel autoVCenterInSuperview]; - [rowLabel autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:iconView withOffset:16.f]; + [rowLabel autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:iconView withOffset:12.f]; UISwitch *blockUserSwitch = [UISwitch new]; blockUserSwitch.on = isBlocked; @@ -616,8 +647,8 @@ NS_ASSUME_NONNULL_BEGIN iconView.image = [icon imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; iconView.tintColor = [UIColor colorWithRGBHex:0x505050]; iconView.contentMode = UIViewContentModeScaleToFill; - [iconView autoSetDimension:ALDimensionWidth toSize:32.f]; - [iconView autoSetDimension:ALDimensionHeight toSize:32.f]; + [iconView autoSetDimension:ALDimensionWidth toSize:24.f]; + [iconView autoSetDimension:ALDimensionHeight toSize:24.f]; return iconView; }