Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications

This commit is contained in:
ismailgulek
2022-01-19 00:12:40 +03:00
102 changed files with 1607 additions and 771 deletions
+9 -3
View File
@@ -448,13 +448,19 @@ final class TabBarCoordinator: NSObject, TabBarCoordinatorType {
self.activityIndicatorPresenter.removeCurrentActivityIndicator(animated: true)
}
} else {
let isThread = roomNavigationParameters.threadParameters != nil
let threadId = roomNavigationParameters.threadParameters?.threadId
let displayConfig: RoomDisplayConfiguration
if threadId != nil {
displayConfig = .forThreads
} else {
displayConfig = .default
}
let roomCoordinatorParameters = RoomCoordinatorParameters(navigationRouterStore: NavigationRouterStore.shared,
session: roomNavigationParameters.mxSession,
roomId: roomNavigationParameters.roomId,
eventId: roomNavigationParameters.eventId,
threadId: roomNavigationParameters.threadParameters?.threadId,
displayConfiguration: isThread ? .forThreads : .default)
threadId: threadId,
displayConfiguration: displayConfig)
self.showRoom(with: roomCoordinatorParameters,
stackOnSplitViewDetail: roomNavigationParameters.presentationParameters.stackAboveVisibleViews,