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

Merge branch 'feature/3310_notes_room_icon' into develop

Browse Source 
# Conflicts:
#	bwi/BwiBuildSettings.swift
This commit is contained in:
Frank Rotermund
2022-07-28 12:06:21 +02:00
parent 7c85ffa252 dcac8c8bf5
commit f58de9e2e3
11 changed files with 90 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/RoomViewController.m
+11 -4
View File
@@ -1860,11 +1860,18 @@ static CGSize kThreadListBarButtonItemImageSize;
MXKImageView *userPictureView = ((RoomTitleView*)self.titleView).pictureView;
// Set user picture in input toolbar
if (userPictureView)
{
[self.roomDataSource.room.summary setRoomAvatarImageIn:userPictureView];
// bwi: if the room is a personal notes room a local image is used as room avatar
if (userPictureView) {
if (BwiBuildSettings.bwiUseCustomPersonalNotesAvatar
&& [self.roomDataSource.room isPersonalNotesRoom]) {
PersonalNotesDefaultService *service = [PersonalNotesDefaultService service:self.mainSession];
userPictureView.image = [UIImage imageNamed:[service avatarImageUrl]];
} else {
[self.roomDataSource.room.summary setRoomAvatarImageIn:userPictureView];
}
}
[self refreshMissedDiscussionsCount:YES];
if (RiotSettings.shared.enableThreads)