Re-enable settings for group conversations

pull/49/head
Niels Andriesse 6 years ago
parent 6b0454317e
commit 4eda27dcc0

@ -191,6 +191,7 @@ typedef void (^SystemMessageActionBlock)(void);
[self.button setTitle:self.action.title forState:UIControlStateNormal]; [self.button setTitle:self.action.title forState:UIControlStateNormal];
UIFont *buttonFont = UIFont.ows_dynamicTypeSubheadlineFont.ows_mediumWeight; UIFont *buttonFont = UIFont.ows_dynamicTypeSubheadlineFont.ows_mediumWeight;
self.button.titleLabel.font = buttonFont; self.button.titleLabel.font = buttonFont;
[self.button setTitleColor:UIColor.lokiGreen forState:UIControlStateNormal];
self.button.hidden = NO; self.button.hidden = NO;
} else { } else {
self.button.hidden = YES; self.button.hidden = YES;

@ -97,11 +97,9 @@ public class ConversationHeaderView: UIStackView {
self.addArrangedSubview(avatarView) self.addArrangedSubview(avatarView)
self.addArrangedSubview(textRows) self.addArrangedSubview(textRows)
if (!thread.isGroupThread()) {
let tapGesture = UITapGestureRecognizer(target: self, action: #selector(didTapView)) let tapGesture = UITapGestureRecognizer(target: self, action: #selector(didTapView))
self.addGestureRecognizer(tapGesture) self.addGestureRecognizer(tapGesture)
} }
}
required public init(coder: NSCoder) { required public init(coder: NSCoder) {
notImplemented() notImplemented()

@ -551,6 +551,7 @@ const CGFloat kIconViewLength = 24;
UISlider *slider = [UISlider new]; UISlider *slider = [UISlider new];
slider.maximumValue = (float)(strongSelf.disappearingMessagesDurations.count - 1); slider.maximumValue = (float)(strongSelf.disappearingMessagesDurations.count - 1);
slider.minimumValue = 0; slider.minimumValue = 0;
slider.tintColor = UIColor.lokiGreen;
slider.continuous = YES; // NO fires change event only once you let go slider.continuous = YES; // NO fires change event only once you let go
slider.value = strongSelf.disappearingMessagesConfiguration.durationIndex; slider.value = strongSelf.disappearingMessagesConfiguration.durationIndex;
[slider addTarget:strongSelf [slider addTarget:strongSelf
@ -600,6 +601,7 @@ const CGFloat kIconViewLength = 24;
// Group settings section. // Group settings section.
/*
if (self.isGroupThread) { if (self.isGroupThread) {
NSArray *groupItems = @[ NSArray *groupItems = @[
[OWSTableItem [OWSTableItem
@ -651,6 +653,7 @@ const CGFloat kIconViewLength = 24;
@"Conversation settings table section title") @"Conversation settings table section title")
items:groupItems]]; items:groupItems]];
} }
*/
// Mute thread section. // Mute thread section.
@ -703,6 +706,7 @@ const CGFloat kIconViewLength = 24;
[weakSelf.navigationController pushViewController:vc animated:YES]; [weakSelf.navigationController pushViewController:vc animated:YES];
}]]; }]];
if (!self.thread.isGroupThread) {
[mainSection [mainSection
addItem: addItem:
[OWSTableItem [OWSTableItem
@ -776,6 +780,7 @@ const CGFloat kIconViewLength = 24;
@"MUTE_BEHAVIOR_EXPLANATION", @"An explanation of the consequences of muting a thread."); @"MUTE_BEHAVIOR_EXPLANATION", @"An explanation of the consequences of muting a thread.");
// [contents addSection:notificationsSection]; // [contents addSection:notificationsSection];
} }
}
// Block Conversation section. // Block Conversation section.
/** /**
@ -992,10 +997,12 @@ const CGFloat kIconViewLength = 24;
[lastTitleView autoPinEdgeToSuperviewEdge:ALEdgeBottom]; [lastTitleView autoPinEdgeToSuperviewEdge:ALEdgeBottom];
if (!self.thread.isGroupThread) {
[mainSectionHeader [mainSectionHeader
addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self
action:@selector(conversationNameTouched:)]]; action:@selector(conversationNameTouched:)]];
mainSectionHeader.userInteractionEnabled = YES; mainSectionHeader.userInteractionEnabled = YES;
}
SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, mainSectionHeader); SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, mainSectionHeader);

Loading…
Cancel
Save