[ios][STG] Fetch user's icon and set it to RecentActivityLogItem

This CL fetches an avatar image via ShareKitService and set it to
RecentActivityLogItem. The property in RecentActivityLogItem is
updated accordingly.

Also `numberOfLines` is updated to have 2 lines at maximum when
the title is long (see the screenshot below).

screenshot with placeholder data: https://drive.google.com/file/d/1E_0y5nPU73tS4ZVI2npEy3u33UEJlrAI/view?usp=sharing

Bug: 370897655
Change-Id: I2d38d07fc437ac1e0f0cf1a43f1ea9d6a536c040
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6037873
Reviewed-by: Gauthier Ambard <gambard@chromium.org>
Commit-Queue: Asami Doi <asamidoi@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1387554}

Author: d0iasm

ios/chrome/browser/ui/tab_switcher/tab_grid/tab_groups/BUILD.gn

@@ -147,6 +147,7 @@ source_set("tab_groups_ui") {
     "//ios/chrome/browser/keyboard/ui_bundled",
     "//ios/chrome/browser/menu/ui_bundled",
     "//ios/chrome/browser/saved_tab_groups/favicon/ui",
+    "//ios/chrome/browser/share_kit/model",
     "//ios/chrome/browser/shared/model/web_state_list",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",

ios/chrome/browser/ui/tab_switcher/tab_grid/tab_groups/recent_activity_coordinator.mm

@@ -8,6 +8,7 @@
 #import "ios/chrome/browser/collaboration/model/messaging/messaging_backend_service_factory.h"
 #import "ios/chrome/browser/favicon/model/ios_chrome_favicon_loader_factory.h"
 #import "ios/chrome/browser/saved_tab_groups/model/tab_group_sync_service_factory.h"
+#import "ios/chrome/browser/share_kit/model/share_kit_service_factory.h"
 #import "ios/chrome/browser/shared/model/browser/browser.h"
 #import "ios/chrome/browser/shared/model/web_state_list/tab_group.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_grid/tab_groups/recent_activity_mediator.h"
@@ -47,7 +48,8 @@ - (void)start {
                                profile)
          faviconLoader:IOSChromeFaviconLoaderFactory::GetForProfile(profile)
            syncService:tab_groups::TabGroupSyncServiceFactory::GetForProfile(
-                           profile)];
+                           profile)
+       shareKitService:ShareKitServiceFactory::GetForProfile(profile)];
   _mediator.consumer = _viewController;
 
   UINavigationController* navigationController = [[UINavigationController alloc]

ios/chrome/browser/ui/tab_switcher/tab_grid/tab_groups/recent_activity_log_cell.h

@@ -10,8 +10,8 @@
 // Represents a log in the recent activity in a shared tab group.
 @interface RecentActivityLogCell : UITableViewCell
 
-// The cell user's icon imageView on the left end.
-@property(nonatomic, readonly, strong) UIImageView* iconImageView;
+// The cell user's avatar view on the left end.
+@property(nonatomic, readonly, strong) UIView* avatarView;
 // The cell favicon imageView on the right end.
 @property(nonatomic, readonly, strong) UIImageView* faviconImageView;
 // The cell title.

ios/chrome/browser/ui/tab_switcher/tab_grid/tab_groups/recent_activity_log_cell.mm

@@ -13,11 +13,7 @@ - (instancetype)initWithStyle:(UITableViewCellStyle)style
   self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
   if (self) {
     self.isAccessibilityElement = YES;
-    _iconImageView = [[UIImageView alloc] init];
-    // The user's icon is smaller than its UIImageView's bounds, so center it.
-    _iconImageView.contentMode = UIViewContentModeCenter;
-    [_iconImageView setContentHuggingPriority:UILayoutPriorityRequired
-                                      forAxis:UILayoutConstraintAxisHorizontal];
+    _avatarView = [[UIView alloc] init];
 
     // The favicon image is smaller than its UIImageView's bounds, so center
     // it.
@@ -31,7 +27,7 @@ - (instancetype)initWithStyle:(UITableViewCellStyle)style
     _titleLabel = [[UILabel alloc] init];
     _titleLabel.font = [UIFont preferredFontForTextStyle:UIFontTextStyleBody];
     _titleLabel.adjustsFontForContentSizeCategory = YES;
-    _titleLabel.numberOfLines = 1;
+    _titleLabel.numberOfLines = 2;
     [_titleLabel
         setContentCompressionResistancePriority:UILayoutPriorityDefaultLow
                                         forAxis:
@@ -53,7 +49,7 @@ - (instancetype)initWithStyle:(UITableViewCellStyle)style
 
     UIStackView* horizontalStack =
         [[UIStackView alloc] initWithArrangedSubviews:@[
-          _iconImageView, verticalStack, _faviconImageView
+          _avatarView, verticalStack, _faviconImageView
         ]];
     horizontalStack.translatesAutoresizingMaskIntoConstraints = NO;
     horizontalStack.axis = UILayoutConstraintAxisHorizontal;
@@ -95,8 +91,10 @@ - (void)prepareForReuse {
   [super prepareForReuse];
   _titleLabel.text = nil;
   _descriptionLabel.text = nil;
-  _iconImageView.image = nil;
   _faviconImageView.image = nil;
+  for (UIView* subview in _avatarView.subviews) {
+    [subview removeFromSuperview];
+  }
 }
 
 @end

ios/chrome/browser/ui/tab_switcher/tab_grid/tab_groups/recent_activity_log_item.h

@@ -7,6 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
+@protocol ShareKitAvatarPrimitive;
+
 // Different type used for RecentActivityLogItem.
 enum class ActivityLogType : NSUInteger {
   kTabAdded,
@@ -30,8 +32,8 @@ enum class ActivityLogType : NSUInteger {
 // The image of a favicon of a page.
 @property(nonatomic, strong) UIImage* favicon;
 
-// The image of a user icon.
-@property(nonatomic, strong) UIImage* userIcon;
+// The object to provide an avatar image.
+@property(nonatomic, strong) id<ShareKitAvatarPrimitive> avatarPrimitive;
 
 // The string of a title.
 @property(nonatomic, strong) NSString* title;

ios/chrome/browser/ui/tab_switcher/tab_grid/tab_groups/recent_activity_mediator.h

@@ -10,8 +10,9 @@
 #import "base/memory/weak_ptr.h"
 
 class FaviconLoader;
-class TabGroup;
 @protocol RecentActivityConsumer;
+class ShareKitService;
+class TabGroup;
 namespace collaboration::messaging {
 class MessagingBackendService;
 }  // namespace collaboration::messaging
@@ -32,6 +33,7 @@ class TabGroupSyncService;
                         messagingService
                    faviconLoader:(FaviconLoader*)faviconLoader
                      syncService:(tab_groups::TabGroupSyncService*)syncService
+                 shareKitService:(ShareKitService*)shareKitService
     NS_DESIGNATED_INITIALIZER;
 
 - (instancetype)init NS_UNAVAILABLE;

ios/chrome/browser/ui/tab_switcher/tab_grid/tab_groups/recent_activity_mediator.mm

@@ -6,20 +6,24 @@
 
 #import "base/strings/sys_string_conversions.h"
 #import "components/collaboration/public/messaging/messaging_backend_service.h"
+#import "components/data_sharing/public/group_data.h"
 #import "components/saved_tab_groups/public/saved_tab_group.h"
 #import "components/saved_tab_groups/public/tab_group_sync_service.h"
 #import "ios/chrome/browser/favicon/model/favicon_loader.h"
 #import "ios/chrome/browser/saved_tab_groups/model/ios_tab_group_sync_util.h"
+#import "ios/chrome/browser/share_kit/model/share_kit_avatar_configuration.h"
+#import "ios/chrome/browser/share_kit/model/share_kit_service.h"
 #import "ios/chrome/browser/shared/model/web_state_list/tab_group.h"
-#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_grid/tab_groups/recent_activity_consumer.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_grid/tab_groups/recent_activity_log_item.h"
 #import "ios/chrome/common/ui/favicon/favicon_attributes.h"
 
 namespace {
 
-// The size of image of a user's icon and a favicon.
-const CGFloat kImageSize = 22;
+// The size of a favicon image.
+const CGFloat kFaviconSize = 20;
+// The size of an avatar image.
+const CGFloat kAvatarSize = 30;
 
 ActivityLogType ConvertCollaborationEvent(
     collaboration::messaging::CollaborationEvent collaboration_event) {
@@ -53,21 +57,26 @@ @implementation RecentActivityMediator {
   raw_ptr<FaviconLoader> _faviconLoader;
   // A service to get the information of a tab group.
   raw_ptr<tab_groups::TabGroupSyncService> _syncService;
+  // A service to get the information of a shared tab group.
+  raw_ptr<ShareKitService> _shareKitService;
 }
 
 - (instancetype)initWithtabGroup:(base::WeakPtr<const TabGroup>)tabGroup
                 messagingService:
                     (collaboration::messaging::MessagingBackendService*)
                         messagingService
                    faviconLoader:(FaviconLoader*)faviconLoader
-                     syncService:(tab_groups::TabGroupSyncService*)syncService {
+                     syncService:(tab_groups::TabGroupSyncService*)syncService
+                 shareKitService:(ShareKitService*)shareKitService {
   CHECK(messagingService);
   CHECK(faviconLoader);
   CHECK(syncService);
+  CHECK(shareKitService);
   if ((self = [super init])) {
     _messagingService = messagingService;
     _faviconLoader = faviconLoader;
     _syncService = syncService;
+    _shareKitService = shareKitService;
   }
   return self;
 }
@@ -103,14 +112,28 @@ - (void)populateItemsFromService {
       _faviconLoader->FaviconForPageUrlOrHost(
           GURL(log.activity_metadata.tab_metadata.value()
                    .last_known_url.value()),
-          kImageSize, ^(FaviconAttributes* attributes) {
+          kFaviconSize, ^(FaviconAttributes* attributes) {
             item.favicon = attributes.faviconImage;
           });
     }
 
-    // TODO(crbug.com/370897655): Get a correct user icon.
-    item.userIcon =
-        DefaultSymbolTemplateWithPointSize(kXMarkCircleFillSymbol, 20);
+    // Get a user's icon from the avatar URL and set it to `item`.
+    // The image is asynchronously loaded.
+    if (_shareKitService->IsSupported() &&
+        log.activity_metadata.triggering_user.has_value()) {
+      ShareKitAvatarConfiguration* config =
+          [[ShareKitAvatarConfiguration alloc] init];
+      data_sharing::GroupMember user =
+          log.activity_metadata.triggering_user.value();
+      config.avatarUrl =
+          [NSURL URLWithString:base::SysUTF8ToNSString(user.avatar_url.spec())];
+      // Use email intead when the display name is empty.
+      config.displayName = user.display_name.empty()
+                               ? base::SysUTF8ToNSString(user.email)
+                               : base::SysUTF8ToNSString(user.display_name);
+      config.avatarSize = CGSizeMake(kAvatarSize, kAvatarSize);
+      item.avatarPrimitive = _shareKitService->AvatarImage(config);
+    }
 
     [items addObject:item];
   }

ios/chrome/browser/ui/tab_switcher/tab_grid/tab_groups/recent_activity_view_controller.mm

@@ -5,6 +5,7 @@
 #import "ios/chrome/browser/ui/tab_switcher/tab_grid/tab_groups/recent_activity_view_controller.h"
 
 #import "base/check.h"
+#import "ios/chrome/browser/share_kit/model/share_kit_avatar_primitive.h"
 #import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/table_view_utils.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_grid/tab_groups/recent_activity_log_cell.h"
@@ -116,8 +117,15 @@ - (UITableViewCell*)cellForTableView:(UITableView*)tableView
       DequeueTableViewCell<RecentActivityLogCell>(tableView);
   cell.titleLabel.text = itemIdentifier.title;
   cell.descriptionLabel.text = itemIdentifier.actionDescription;
-  cell.iconImageView.image = itemIdentifier.userIcon;
   cell.faviconImageView.image = itemIdentifier.favicon;
+
+  UIView* view = [itemIdentifier.avatarPrimitive view];
+  [cell.avatarView addSubview:view];
+  [NSLayoutConstraint activateConstraints:@[
+    [view.centerXAnchor constraintEqualToAnchor:cell.avatarView.centerXAnchor],
+    [view.centerYAnchor constraintEqualToAnchor:cell.avatarView.centerYAnchor],
+  ]];
+  [itemIdentifier.avatarPrimitive resolve];
   return cell;
 }