Signed-off-by: Ivan Sein <ivan@nextcloud.com>
This commit is contained in:
Ivan Sein 2020-02-05 14:43:33 +01:00
Родитель 86de11c688
Коммит 0cab4dfc0f
9 изменённых файлов: 48 добавлений и 7 удалений

Просмотреть файл

@ -342,9 +342,11 @@
cell.labelTitle.text = participant.name; cell.labelTitle.text = participant.name;
if ([participant.source isEqualToString:@"users"]) { if ([participant.source isEqualToString:kParticipantTypeUser]) {
[cell.contactImage setImageWithURLRequest:[[NCAPIController sharedInstance] createAvatarRequestForUser:participant.userId andSize:96 usingAccount:[[NCDatabaseManager sharedInstance] activeAccount]] [cell.contactImage setImageWithURLRequest:[[NCAPIController sharedInstance] createAvatarRequestForUser:participant.userId andSize:96 usingAccount:[[NCDatabaseManager sharedInstance] activeAccount]]
placeholderImage:nil success:nil failure:nil]; placeholderImage:nil success:nil failure:nil];
} else if ([participant.source isEqualToString:kParticipantTypeEmail]) {
[cell.contactImage setImage:[UIImage imageNamed:@"mail-bg"]];
} else { } else {
[cell.contactImage setImage:[UIImage imageNamed:@"group-bg"]]; [cell.contactImage setImage:[UIImage imageNamed:@"group-bg"]];
} }

23
VideoCalls/Images.xcassets/mail-bg.imageset/Contents.json поставляемый Normal file
Просмотреть файл

@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "mail-bg.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "mail-bg@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "mail-bg@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Двоичные данные
VideoCalls/Images.xcassets/mail-bg.imageset/mail-bg.png поставляемый Normal file

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 735 B

Двоичные данные
VideoCalls/Images.xcassets/mail-bg.imageset/mail-bg@2x.png поставляемый Normal file

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 1.3 KiB

Двоичные данные
VideoCalls/Images.xcassets/mail-bg.imageset/mail-bg@3x.png поставляемый Normal file

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 1.7 KiB

Просмотреть файл

@ -103,8 +103,14 @@
cell.labelTitle.text = contact.name; cell.labelTitle.text = contact.name;
[cell.contactImage setImageWithURLRequest:[[NCAPIController sharedInstance] createAvatarRequestForUser:contact.userId andSize:96 usingAccount:[[NCDatabaseManager sharedInstance] activeAccount]] if ([contact.source isEqualToString:kParticipantTypeUser]) {
placeholderImage:nil success:nil failure:nil]; [cell.contactImage setImageWithURLRequest:[[NCAPIController sharedInstance] createAvatarRequestForUser:contact.userId andSize:96 usingAccount:[[NCDatabaseManager sharedInstance] activeAccount]]
placeholderImage:nil success:nil failure:nil];
} else if ([contact.source isEqualToString:kParticipantTypeEmail]) {
[cell.contactImage setImage:[UIImage imageNamed:@"mail-bg"]];
} else {
[cell.contactImage setImage:[UIImage imageNamed:@"group-bg"]];
}
cell.accessoryView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"checkbox-unchecked"]]; cell.accessoryView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"checkbox-unchecked"]];
for (NCUser *user in _selectedParticipants) { for (NCUser *user in _selectedParticipants) {

Просмотреть файл

@ -366,9 +366,11 @@ NSString * const NCRoomCreatedNotification = @"NCRoomCreatedNotification";
cell.labelTitle.text = participant.name; cell.labelTitle.text = participant.name;
if ([participant.source isEqualToString:@"users"]) { if ([participant.source isEqualToString:kParticipantTypeUser]) {
[cell.contactImage setImageWithURLRequest:[[NCAPIController sharedInstance] createAvatarRequestForUser:participant.userId andSize:96 usingAccount:[[NCDatabaseManager sharedInstance] activeAccount]] [cell.contactImage setImageWithURLRequest:[[NCAPIController sharedInstance] createAvatarRequestForUser:participant.userId andSize:96 usingAccount:[[NCDatabaseManager sharedInstance] activeAccount]]
placeholderImage:nil success:nil failure:nil]; placeholderImage:nil success:nil failure:nil];
} else if ([participant.source isEqualToString:kParticipantTypeEmail]) {
[cell.contactImage setImage:[UIImage imageNamed:@"mail-bg"]];
} else { } else {
[cell.contactImage setImage:[UIImage imageNamed:@"group-bg"]]; [cell.contactImage setImage:[UIImage imageNamed:@"group-bg"]];
} }

Просмотреть файл

@ -319,9 +319,11 @@
cell.labelTitle.text = participant.name; cell.labelTitle.text = participant.name;
if ([participant.source isEqualToString:@"users"]) { if ([participant.source isEqualToString:kParticipantTypeUser]) {
[cell.contactImage setImageWithURLRequest:[[NCAPIController sharedInstance] createAvatarRequestForUser:participant.userId andSize:96 usingAccount:[[NCDatabaseManager sharedInstance] activeAccount]] [cell.contactImage setImageWithURLRequest:[[NCAPIController sharedInstance] createAvatarRequestForUser:participant.userId andSize:96 usingAccount:[[NCDatabaseManager sharedInstance] activeAccount]]
placeholderImage:nil success:nil failure:nil]; placeholderImage:nil success:nil failure:nil];
} else if ([participant.source isEqualToString:kParticipantTypeEmail]) {
[cell.contactImage setImage:[UIImage imageNamed:@"mail-bg"]];
} else { } else {
[cell.contactImage setImage:[UIImage imageNamed:@"group-bg"]]; [cell.contactImage setImage:[UIImage imageNamed:@"group-bg"]];
} }

Просмотреть файл

@ -103,8 +103,14 @@
cell.labelTitle.text = contact.name; cell.labelTitle.text = contact.name;
[cell.contactImage setImageWithURLRequest:[[NCAPIController sharedInstance] createAvatarRequestForUser:contact.userId andSize:96 usingAccount:[[NCDatabaseManager sharedInstance] activeAccount]] if ([contact.source isEqualToString:kParticipantTypeUser]) {
placeholderImage:nil success:nil failure:nil]; [cell.contactImage setImageWithURLRequest:[[NCAPIController sharedInstance] createAvatarRequestForUser:contact.userId andSize:96 usingAccount:[[NCDatabaseManager sharedInstance] activeAccount]]
placeholderImage:nil success:nil failure:nil];
} else if ([contact.source isEqualToString:kParticipantTypeEmail]) {
[cell.contactImage setImage:[UIImage imageNamed:@"mail-bg"]];
} else {
[cell.contactImage setImage:[UIImage imageNamed:@"group-bg"]];
}
return cell; return cell;
} }