Merge pull request #1893 from nextcloud/fix/1884/replace-link-icon

Author: Ivansss

NextcloudTalk/AvatarView.swift

@@ -126,8 +126,13 @@ import SDWebImage
                 setUserStatus(roomStatus, with: backgroundColor)
             }
         } else if room.isPublic {
-            if let statusImage = statusImageWith(name: "link", color: .label, padding: 4) {
-                setUserStatusImage(statusImage, with: backgroundColor)
+            if let statusImage = UIImage(named: "link") {
+                let diameter = statusImageSize(padding: 2)
+                let size = CGSize(width: diameter, height: diameter)
+                if let configuredImage = NCUtils.renderAspectImage(image: statusImage, ofSize: size, centerImage: true)?.withRenderingMode(.alwaysTemplate) {
+                    setUserStatusImage(configuredImage, with: backgroundColor)
+                    userStatusImageView.tintColor = .label
+                }
             }
         } else if room.isFederated {
             if let statusImage = statusImageWith(name: "globe", color: .label, padding: 3) {
@@ -173,8 +178,7 @@ import SDWebImage
     }
 
     private func statusImageWith(name: String, color: UIColor, secondaryColor: UIColor? = nil, padding: CGFloat) -> UIImage? {
-        let userStatusSize = self.frame.size.height * userStatusSizePercentage - padding * 2
-        let sizeConfiguration = UIImage.SymbolConfiguration(pointSize: userStatusSize)
+        let sizeConfiguration = UIImage.SymbolConfiguration(pointSize: statusImageSize(padding: padding))
 
         // Multicolor image
         if let secondaryColor {
@@ -195,4 +199,8 @@ import SDWebImage
 
         return nil
     }
+
+    private func statusImageSize(padding: CGFloat) -> CGFloat {
+        return self.frame.size.height * userStatusSizePercentage - padding * 2
+    }
 }

NextcloudTalk/Images.xcassets/link.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "icon-public-white.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

NextcloudTalk/Images.xcassets/link.imageset/icon-public-white.svg

@@ -467,12 +467,12 @@ enum RoomVisibilityOption: Int {
             switch option {
             case RoomVisibilityOption.kAllowGuestsOption.rawValue:
                 roomVisibilityOptionCell = tableView.dequeueOrCreateCell(withIdentifier: "AllowGuestsCellIdentifier")
-                roomVisibilityOptionCell.textLabel?.text = NSLocalizedString("Allow guests", comment: "")
+                roomVisibilityOptionCell.textLabel?.text = NSLocalizedString("Allow guests to join this conversation via link", comment: "")
                 let optionSwicth = UISwitch()
                 optionSwicth.isOn = self.isPublic
                 optionSwicth.addTarget(self, action: #selector(allowGuestValueChanged(_:)), for: .valueChanged)
                 roomVisibilityOptionCell.accessoryView = optionSwicth
-                roomVisibilityOptionCell.imageView?.image = UIImage(systemName: "link")
+                roomVisibilityOptionCell.imageView?.image = UIImage(named: "link")?.withRenderingMode(.alwaysTemplate)
             case RoomVisibilityOption.kPasswordProtectionOption.rawValue:
                 roomVisibilityOptionCell = tableView.dequeueOrCreateCell(withIdentifier: "SetPasswordCellIdentifier")
                 roomVisibilityOptionCell.textLabel?.text = self.roomPassword.isEmpty ? NSLocalizedString("Set password", comment: "") : NSLocalizedString("Change password", comment: "")

NextcloudTalk/RoomCreationTableViewController.swift

@@ -2032,12 +2032,12 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
                         cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:allowGuestsCellIdentifier];
                     }
 
-                    cell.textLabel.text = NSLocalizedString(@"Allow guests", nil);
+                    cell.textLabel.text = NSLocalizedString(@"Allow guests to join this conversation via link", nil);
                     cell.textLabel.numberOfLines = 0;
                     cell.selectionStyle = UITableViewCellSelectionStyleNone;
                     cell.accessoryView = _publicSwitch;
                     _publicSwitch.on = (_room.type == kNCRoomTypePublic) ? YES : NO;
-                    [cell.imageView setImage:[UIImage systemImageNamed:@"link"]];
+                    [cell.imageView setImage:[[UIImage imageNamed:@"link"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]];
                     cell.imageView.tintColor = [UIColor secondaryLabelColor];
 
                     return cell;

NextcloudTalk/RoomInfoTableViewController.m

@@ -128,7 +128,7 @@
 "All notifications are muted" = "All notifications are muted";
 
 /* No comment provided by engineer. */
-"Allow guests" = "Allow guests";
+"Allow guests to join this conversation via link" = "Allow guests to join this conversation via link";
 
 /* '@all' should not be translated */
 "Allow participants to mention @all" = "Allow participants to mention @all";