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

Ensure DisabledRoomInputToolbarView is used. Fix previewing rooms. Fix favourited DMs in Home.

Browse Source
This commit is contained in:
Doug
2021-11-03 10:18:27 +00:00
parent 24bbfca511
commit 6497cfd8e2
8 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/RoomCoordinator.swift
+10 -1
View File
@@ -92,7 +92,9 @@ final class RoomCoordinator: NSObject, RoomCoordinatorProtocol {
// Detect when view controller has been dismissed by gesture when presented modally (not in full screen).
self.roomViewController.presentationController?.delegate = self
if let eventId = self.selectedEventId {
if let previewData = self.parameters.previewData {
self.loadRoomPreview(withData: previewData, completion: completion)
} else if let eventId = self.selectedEventId {
self.loadRoom(withId: self.parameters.roomId, and: eventId, completion: completion)
} else {
self.loadRoom(withId: self.parameters.roomId, completion: completion)
@@ -178,6 +180,13 @@ final class RoomCoordinator: NSObject, RoomCoordinatorProtocol {
completion?()
}
}
private func loadRoomPreview(withData previewData: RoomPreviewData, completion: (() -> Void)?) {
self.roomViewController.displayRoomPreview(previewData)
completion?()
}
}
// MARK: - RoomIdentifiable
Riot/Modules/Room/RoomViewController.m
+6 -9
View File
@@ -1084,16 +1084,12 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
if (self.roomDataSource)
{
// Restore tool bar view and room activities view if none
if (!self.inputToolbarView)
{
[self updateRoomInputToolbarViewClassIfNeeded];
[self refreshRoomInputToolbar];
self.inputToolbarView.hidden = (self.roomDataSource.state != MXKDataSourceStateReady);
}
// Update the input toolbar class and update the layout
[self updateRoomInputToolbarViewClassIfNeeded];
self.inputToolbarView.hidden = (self.roomDataSource.state != MXKDataSourceStateReady);
// Restore room activities view if none
if (!self.activitiesView)
{
// And the extra area
@@ -1178,6 +1174,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
}
[self updateInputToolBarViewHeight];
[self refreshRoomInputToolbar];
}
}