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

[Spaces] M10.7 Explore rooms #4571

Browse Source 
- Update after design review
This commit is contained in:
Gil Eluard
2021-08-16 15:44:44 +02:00
parent 9c02c55f84
commit e70d3bb67c
14 changed files with 88 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/RoomViewController.m
+12 -10
View File
@@ -239,6 +239,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
@property (nonatomic, strong) CustomSizedPresentationController *customSizedPresentationController;
@property (nonatomic, getter=isActivitiesViewExpanded) BOOL activitiesViewExpanded;
@property (nonatomic, getter=isScrollToBottomHidden) BOOL scrollToBottomHidden;
@property (nonatomic, getter=isMissedDiscussionsBadgeHidden) BOOL missedDiscussionsBadgeHidden;
@property (nonatomic, strong) VoiceMessageController *voiceMessageController;
@@ -1394,12 +1395,6 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
}
}
- (void)setShowMissedDiscussionsBadge:(BOOL)showMissedDiscussionsBadge
{
missedDiscussionsBadgeLabel.hidden = !showMissedDiscussionsBadge;
missedDiscussionsDotView.hidden = !showMissedDiscussionsBadge;
}
- (void)setScrollToBottomHidden:(BOOL)scrollToBottomHidden
{
if (_scrollToBottomHidden != scrollToBottomHidden)
@@ -1423,6 +1418,13 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
}];
}
- (void)setMissedDiscussionsBadgeHidden:(BOOL)missedDiscussionsBadgeHidden{
_missedDiscussionsBadgeHidden = missedDiscussionsBadgeHidden;
missedDiscussionsBadgeLabel.hidden = missedDiscussionsBadgeHidden;
missedDiscussionsDotView.hidden = missedDiscussionsBadgeHidden;
}
#pragma mark - Internals
- (UIBarButtonItem *)videoCallBarButtonItem
@@ -4707,16 +4709,16 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
- (void)refreshMissedDiscussionsCount:(BOOL)force
{
// Ignore this action when no room is displayed
if (!self.roomDataSource || !missedDiscussionsBadgeLabel
if (!self.showMissedDiscussionsBadge || !self.roomDataSource || !missedDiscussionsBadgeLabel
|| [UIDevice currentDevice].userInterfaceIdiom != UIUserInterfaceIdiomPhone
|| ([[UIScreen mainScreen] nativeBounds].size.height > 2532 && UIInterfaceOrientationIsLandscape([UIApplication sharedApplication].statusBarOrientation)))
{
self.showMissedDiscussionsBadge = NO;
self.missedDiscussionsBadgeHidden = YES;
return;
}
self.showMissedDiscussionsBadge = YES;
self.missedDiscussionsBadgeHidden = NO;
NSUInteger highlightCount = 0;
NSUInteger missedCount = [[AppDelegate theDelegate].masterTabBarController missedDiscussionsCount];