felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-27 11:46:58 +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 25c21e9653 27571866b5
commit 6dce767666
82 changed files with 515 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift
+3 -3
View File
@@ -42,11 +42,11 @@ final class RoomInfoCoordinator: NSObject, RoomInfoCoordinatorType {
participants.mxRoom = self.room
participants.parentSpaceId = self.parentSpaceId
participants.delegate = self
participants.screenTimer = AnalyticsScreenTimer(screen: .roomMembers)
participants.screenTracker = AnalyticsScreenTracker(screen: .roomMembers)
let files = RoomFilesViewController()
files.finalizeInit()
files.screenTimer = AnalyticsScreenTimer(screen: .roomUploads)
files.screenTracker = AnalyticsScreenTracker(screen: .roomUploads)
MXKRoomDataSource.load(withRoomId: self.room.roomId, andMatrixSession: self.session) { (dataSource) in
guard let dataSource = dataSource as? MXKRoomDataSource else { return }
dataSource.filterMessagesWithURL = true
@@ -58,7 +58,7 @@ final class RoomInfoCoordinator: NSObject, RoomInfoCoordinatorType {
let settings = RoomSettingsViewController()
settings.delegate = self
settings.finalizeInit()
settings.screenTimer = AnalyticsScreenTimer(screen: .roomSettings)
settings.screenTracker = AnalyticsScreenTracker(screen: .roomSettings)
settings.initWith(self.session, andRoomId: self.room.roomId)
if self.room.isDirect {
Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
+4 -5
View File
@@ -43,7 +43,7 @@ final class RoomInfoListViewController: UIViewController {
private var indicatorPresenter: UserIndicatorTypePresenterProtocol!
private var loadingIndicator: UserIndicator?
private var isRoomDirect: Bool = false
private var screenTimer = AnalyticsScreenTimer(screen: .roomDetails)
private var screenTracker = AnalyticsScreenTracker(screen: .roomDetails)
private lazy var closeButton: CloseButton = {
let button = CloseButton()
@@ -134,9 +134,9 @@ final class RoomInfoListViewController: UIViewController {
return self.theme.statusBarStyle
}
override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated)
screenTimer.start()
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
screenTracker.trackScreen()
}
override func viewDidLayoutSubviews() {
@@ -147,7 +147,6 @@ final class RoomInfoListViewController: UIViewController {
override func viewDidDisappear(_ animated: Bool) {
super.viewDidDisappear(animated)
screenTimer.stop()
stopLoading()
}