felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-03 14:46:56 +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/People/PeopleViewController.m
+3 -3
View File
@@ -68,7 +68,7 @@
// This will be used by the shared RecentsDataSource instance for sanity checks (see UITableViewDataSource methods).
self.recentsTableView.tag = RecentsDataSourceModePeople;
UIImage *fabImage = self.dataSource.currentSpace == nil ? [UIImage imageNamed:@"people_floating_action"] : [UIImage imageNamed:@"add_member_floating_action"];
UIImage *fabImage = self.dataSource.currentSpace == nil ? AssetImages.peopleFloatingAction.image : AssetImages.addMemberFloatingAction.image;
// Add the (+) button programmatically
plusButtonImageView = [self vc_addFABWithImage:fabImage
target:self
@@ -178,11 +178,11 @@
{
if (ThemeService.shared.isCurrentThemeDark)
{
return [UIImage imageNamed:@"people_empty_screen_artwork_dark"];
return AssetImages.peopleEmptyScreenArtworkDark.image;
}
else
{
return [UIImage imageNamed:@"people_empty_screen_artwork"];
return AssetImages.peopleEmptyScreenArtwork.image;
}
}