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

Merge branch 'develop' into gil/SP1_space_creation

Browse Source 
# Conflicts:
#	Riot/Modules/People/PeopleViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceList/SpaceListViewModel.swift
This commit is contained in:
Gil Eluard
2022-02-21 17:20:58 +01:00
parent dacbaea946 3396ea054d
commit ff685a4c37
685 changed files with 8778 additions and 3678 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Spaces/SpaceList/SpaceListViewModel.swift
+1 -2
View File
@@ -247,8 +247,7 @@ final class SpaceListViewModel: SpaceListViewModelType {
session.spaceService.rootSpaceSummaries.forEach { summary in
let avatarViewData = AvatarViewData(matrixItemId: summary.roomId, displayName: summary.displayname, avatarUrl: summary.avatar, mediaManager: session.mediaManager, fallbackImage: .matrixItem(summary.roomId, summary.displayname))
let notificationState = session.spaceService.notificationCounter.notificationState(forSpaceWithId: summary.roomId)
let viewData = SpaceListItemViewData(spaceId: summary.roomId,
title: summary.displayname,
let viewData = SpaceListItemViewData(spaceId: summary.roomId, title: summary.displayname,
avatarViewData: avatarViewData,
isInvite: summary.membership == .invite,
notificationCount: notificationState?.groupMissedDiscussionsCount ?? 0,