Use user-icon for former one2one rooms.

Signed-off-by: Ivan Sein <ivan@nextcloud.com>

NextcloudTalk/Images.xcassets/user-15.imageset/Contents.json

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

NextcloudTalk/Images.xcassets/user-18.imageset/Contents.json

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

NextcloudTalk/Images.xcassets/user-profile.imageset/Contents.json

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

NextcloudTalk/NCChatTitleView.m

@@ -114,6 +114,10 @@
         case kNCRoomTypeChangelog:
             [self.avatarimage setImage:[UIImage imageNamed:@"changelog"]];
             break;
+        case kNCRoomTypeFormerOneToOne:
+            [self.avatarimage setImage:[UIImage imageNamed:@"user-15"]];
+            [self.avatarimage setContentMode:UIViewContentModeCenter];
+            break;
         default:
             break;
     }

NextcloudTalk/NCChatViewController.m

@@ -1616,7 +1616,7 @@ NSString * const NCChatViewControllerTalkToUserNotification = @"NCChatViewContro
                     }];
                     
                     if ([appId isEqualToString:@"profile"]) {
-                        [action setValue:[[UIImage imageNamed:@"user"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate] forKey:@"image"];
+                        [action setValue:[[UIImage imageNamed:@"user-profile"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate] forKey:@"image"];
                     } else if ([appId isEqualToString:@"email"]) {
                         [action setValue:[[UIImage imageNamed:@"mail"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate] forKey:@"image"];
                     }
@@ -3680,7 +3680,7 @@ NSString * const NCChatViewControllerTalkToUserNotification = @"NCChatViewContro
     TalkAccount *activeAccount = [[NCDatabaseManager sharedInstance] activeAccount];
     if ([self isMessageReplyable:message] && _room.type != kNCRoomTypeOneToOne && [message.actorType isEqualToString:@"users"] && ![message.actorId isEqualToString:activeAccount.userId] )
     {
-        UIImage *replyPrivateImage = [[UIImage imageNamed:@"user"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+        UIImage *replyPrivateImage = [[UIImage imageNamed:@"user-profile"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
         UIAction *replyPrivateAction = [UIAction actionWithTitle:NSLocalizedString(@"Reply privately", nil) image:replyPrivateImage identifier:nil handler:^(UIAction *action){
             
             [self didPressReplyPrivately:message];

NextcloudTalk/NCRoom.h

@@ -30,7 +30,8 @@ typedef enum NCRoomType {
     kNCRoomTypeOneToOne = 1,
     kNCRoomTypeGroup,
     kNCRoomTypePublic,
-    kNCRoomTypeChangelog
+    kNCRoomTypeChangelog,
+    kNCRoomTypeFormerOneToOne
 } NCRoomType;
 
 typedef enum NCRoomNotificationLevel {

NextcloudTalk/RoomInfoTableViewController.m

@@ -1790,7 +1790,11 @@ typedef enum FileAction {
                     [cell.roomImage setContentMode:UIViewContentModeScaleToFill];
                 }
                     break;
-                    
+
+                case kNCRoomTypeFormerOneToOne:
+                    [cell.roomImage setImage:[UIImage imageNamed:@"user"]];
+                    break;
+
                 default:
                     break;
             }

NextcloudTalk/RoomSearchTableViewController.m

@@ -326,7 +326,11 @@ typedef enum RoomSearchSection {
             [cell.roomImage setImage:[UIImage imageNamed:@"changelog"]];
             [cell.roomImage setContentMode:UIViewContentModeScaleToFill];
             break;
-            
+
+        case kNCRoomTypeFormerOneToOne:
+            [cell.roomImage setImage:[UIImage imageNamed:@"user"]];
+            break;
+
         default:
             break;
     }

NextcloudTalk/RoomsTableViewController.m

@@ -1208,7 +1208,11 @@ typedef void (^FetchRoomsCompletionBlock)(BOOL success);
             [cell.roomImage setImage:[UIImage imageNamed:@"changelog"]];
             [cell.roomImage setContentMode:UIViewContentModeScaleToFill];
             break;
-            
+
+        case kNCRoomTypeFormerOneToOne:
+            [cell.roomImage setImage:[UIImage imageNamed:@"user"]];
+            break;
+
         default:
             break;
     }

ShareExtension/ShareViewController.m

@@ -298,7 +298,7 @@
         UIGraphicsEndImageContext();
         [profileButton setImage:profileImage forState:UIControlStateNormal];
     } else {
-        UIImage *profileImage = [[UIImage imageNamed:@"user"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+        UIImage *profileImage = [[UIImage imageNamed:@"user-profile"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
         [profileButton setImage:profileImage forState:UIControlStateNormal];
         profileButton.contentMode = UIViewContentModeCenter;
     }
@@ -586,6 +586,10 @@
             [cell.avatarImageView setImage:[UIImage imageNamed:@"changelog"]];
             [cell.avatarImageView setContentMode:UIViewContentModeScaleToFill];
             break;
+
+        case kNCRoomTypeFormerOneToOne:
+            [cell.avatarImageView setImage:[UIImage imageNamed:@"user-18"]];
+            break;
             
         default:
             break;