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

Merge branch 'develop' into gil/SP1_space_creation

Browse Source 
# Conflicts:
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/Room/Settings/RoomSettingsViewController.h
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
This commit is contained in:
Gil Eluard
2022-03-08 11:23:55 +01:00
parent cf015c4ef2 acf7d0de13
commit cdd66146d8
82 changed files with 515 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/RoomViewController.m
+11 -12
View File
@@ -217,7 +217,6 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
@property (nonatomic, weak) IBOutlet UIView *userSuggestionContainerView;
@property (nonatomic, readwrite) RoomDisplayConfiguration *displayConfiguration;
@property (nonatomic) AnalyticsScreenTimer *screenTimer;
// When layout of the screen changes (e.g. height), we no longer know whether
// to autoscroll to the bottom again or not. Instead we need to capture the
@@ -322,8 +321,6 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
_voiceMessageController = [[VoiceMessageController alloc] initWithThemeService:ThemeService.shared mediaServiceProvider:VoiceMessageMediaServiceProvider.sharedProvider];
self.voiceMessageController.delegate = self;
self.screenTimer = [[AnalyticsScreenTimer alloc] initWithScreen:AnalyticsScreenRoom];
}
- (void)viewDidLoad
@@ -578,6 +575,17 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
{
[super viewDidAppear:animated];
// Screen tracking
MXRoomSummary *summary = [self.mainSession roomWithRoomId:self.roomDataSource.roomId].summary;
if (!summary || !summary.isJoined)
{
[AnalyticsScreenTracker trackScreen: AnalyticsScreenRoomPreview];
}
else
{
[AnalyticsScreenTracker trackScreen: AnalyticsScreenRoom];
}
isAppeared = YES;
[self checkReadMarkerVisibility];
@@ -623,13 +631,6 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
[self reloadBubblesTable:YES];
}
// Screen tracking
[self.screenTimer start];
if (self.showSettingsInitially)
{
[self showRoomInfoWithInitialSection:RoomInfoSectionSettings animated:NO];
}
self.showSettingsInitially = NO;
}
@@ -666,8 +667,6 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
hasJitsiCall = YES;
[self reloadBubblesTable:YES];
}
[self.screenTimer stop];
}
- (void)viewWillLayoutSubviews {