Merge branch 'develop' into gil/SP1_space_creation

# 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
82 changed files with 515 additions and 344 deletions
@@ -71,6 +71,12 @@ class SpaceMenuViewController: UIViewController {
self.viewModel.viewDelegate = self
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
AnalyticsScreenTracker.trackScreen(.spaceMenu)
}
override var preferredStatusBarStyle: UIStatusBarStyle {
return self.theme.statusBarStyle
}