felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-22 07:32:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into email_invitation

Browse Source 
Conflicts:
	Vector/Categories/MXKRoomBubbleTableViewCell+Vector.m
This commit is contained in:
manuroe
2016-02-08 11:17:56 +01:00
parent 0d0d57dec3 67148cce21
commit 96c8d76702
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Vector/Categories/MXKRoomBubbleTableViewCell+Vector.m
+12 -7
View File
@@ -285,14 +285,19 @@ NSString *const kMXKRoomBubbleCellVectorEditButtonPressed = @"kMXKRoomBubbleCell
MXKRoomBubbleComponent *component = self.bubbleData.bubbleComponents[componentIndex];
// Define 'Edit' button frame by overlapping slightly the time label
// (vertical pos = (component.position.y + 9) instead of (component.position.y + 18))
UIButton *editButton = [[UIButton alloc] initWithFrame:CGRectMake(0, component.position.y + 9, self.bubbleInfoContainer.frame.size.width , 33)];
// (vertical pos = (component.position.y + 4) instead of (component.position.y + 18))
UIButton *editButton = [[UIButton alloc] initWithFrame:CGRectMake(0, component.position.y + 4, self.bubbleInfoContainer.frame.size.width + 15 , 44)];
[editButton setTitle:NSLocalizedStringFromTable(@"room_event_action_edit", @"Vector", nil) forState:UIControlStateNormal];
[editButton setTitle:NSLocalizedStringFromTable(@"room_event_action_edit", @"Vector", nil) forState:UIControlStateSelected];
[editButton setTitleColor:kVectorColorGreen forState:UIControlStateNormal];
[editButton setTitleColor:kVectorColorGreen forState:UIControlStateSelected];
[editButton setTitleColor:kVectorColorGree forState:UIControlStateNormal];
[editButton setTitleColor:kVectorColorGree forState:UIControlStateSelected];
// Align button label on the right border of the bubbleInfoContainer
editButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight;
UIEdgeInsets edgeInset = editButton.titleEdgeInsets;
edgeInset.right = 15;
editButton.titleEdgeInsets = edgeInset;
editButton.backgroundColor = [UIColor clearColor];
if ([UIFont respondsToSelector:@selector(systemFontOfSize:weight:)])
@@ -326,21 +331,21 @@ NSString *const kMXKRoomBubbleCellVectorEditButtonPressed = @"kMXKRoomBubbleCell
toItem:self.bubbleInfoContainer
attribute:NSLayoutAttributeTrailing
multiplier:1.0
constant:0];
constant:15];
NSLayoutConstraint *topConstraint = [NSLayoutConstraint constraintWithItem:editButton
attribute:NSLayoutAttributeTop
relatedBy:NSLayoutRelationEqual
toItem:self.bubbleInfoContainer
attribute:NSLayoutAttributeTop
multiplier:1.0
constant:component.position.y + 9];
constant:component.position.y + 4];
NSLayoutConstraint *heightConstraint = [NSLayoutConstraint constraintWithItem:editButton
attribute:NSLayoutAttributeHeight
relatedBy:NSLayoutRelationEqual
toItem:nil
attribute:NSLayoutAttributeNotAnAttribute
multiplier:1.0
constant:33];
constant:44];
// Available on iOS 8 and later
[NSLayoutConstraint activateConstraints:@[leftConstraint, rightConstraint, topConstraint, heightConstraint]];
Vector/ViewController/RoomCreationStep2ViewController.m
-5
View File
@@ -108,11 +108,6 @@
#pragma mark - UITableView delegate
- (NSArray *)tableView:(UITableView *)tableView editActionsForRowAtIndexPath:(NSIndexPath *)indexPath
{
return [[NSMutableArray alloc] init];
}
- (void)customizeContactCell:(ContactTableViewCell*)contactTableViewCell atIndexPath:(NSIndexPath *)indexPath
{
if (indexPath.section == participantsSection)
Vector/ViewController/RoomParticipantsViewController.m
+5
View File
@@ -654,6 +654,11 @@
return cell;
}
- (void)tableView:(UITableView*)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath*)indexPath
{
// iOS8 requires this method to enable editing (see editActionsForRowAtIndexPath).
}
#pragma mark - UITableView delegate
- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section