felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-21 17:12:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move invites to dedicated sections and enable section collapse (#5683)

Browse Source 
* Display invites in dedicated sections

* Activate shrinkable and fix home number of rows for section

* Rework section header

* Display badge in people and room tabs

* Add changelog & remove useless todo

* Improve isSectionShrinked condition, remove useless import and shrinkable sets

* Restore invitation count in tab bar badge

* Display badge for invites section

* Add comment on invites count

* Update right accessory view on data source update

Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr>
This commit is contained in:
aringenbach
2022-02-28 13:48:07 +01:00
committed by GitHub
parent 20fb5d2aee
commit 60f2355e54
12 changed files with 206 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Common/SectionHeaders/SectionHeaderView.m
+39 -2
View File
@@ -85,6 +85,19 @@ static const CGFloat kInterItemsSpaceHorizontal = 8.0;
[self setNeedsLayout];
}
- (void)setRightAccessoryView:(UIView *)rightAccessoryView
{
// remove old one
[_rightAccessoryView removeFromSuperview];
_rightAccessoryView = rightAccessoryView;
if (_rightAccessoryView)
{
// add new one
[self.contentView addSubview:_rightAccessoryView];
}
[self setNeedsLayout];
}
- (void)setBottomView:(UIView *)bottomView
{
// remove old one
@@ -169,6 +182,10 @@ static const CGFloat kInterItemsSpaceHorizontal = 8.0;
{
rightMargin += _accessoryView.frame.size.width + kInterItemsSpaceHorizontal;
}
if (_rightAccessoryView)
{
rightMargin += _rightAccessoryView.frame.size.width + kInterItemsSpaceHorizontal;
}
if (_bottomView)
{
// set header label top
@@ -179,7 +196,8 @@ static const CGFloat kInterItemsSpaceHorizontal = 8.0;
// center header label vertically
frame.origin.y = MAX(0, (self.contentView.bounds.size.height - frame.size.height)/2);
}
frame.size.width = self.contentView.bounds.size.width - leftMargin - rightMargin;
frame.size.width = MIN(self.contentView.bounds.size.width - leftMargin - rightMargin,
[_headerLabel sizeThatFits:self.frame.size].width);
_headerLabel.frame = frame;
}
@@ -190,11 +208,30 @@ static const CGFloat kInterItemsSpaceHorizontal = 8.0;
rightMargin = MAX(_rightInset, 20);
CGRect frame = _accessoryView.frame;
frame.origin.x = self.contentView.bounds.size.width - frame.size.width - rightMargin;
if(_headerLabel)
{
frame.origin.x = leftMargin + _headerLabel.frame.size.width + kInterItemsSpaceHorizontal;
}
else
{
frame.origin.x = leftMargin;
}
frame.origin.y = MAX(0, (_topViewHeight - frame.size.height)/2);
_accessoryView.frame = frame;
}
if (_rightAccessoryView)
{
// reset margins
leftMargin = MAX(_leftInset, 20);
rightMargin = MAX(_rightInset, 20);
CGRect frame = _rightAccessoryView.frame;
frame.origin.x = self.contentView.bounds.size.width - frame.size.width - rightMargin;
frame.origin.y = MAX(0, (_topViewHeight - frame.size.height)/2);
_rightAccessoryView.frame = frame;
}
if (_bottomView)
{
// reset margins