Use new decorative colours for avatars and displaynames. (#2438)

element-hq · Feb 9, 2024 · cc1d9ca · cc1d9ca
1 parent 2597f6d
commit cc1d9ca
Show file tree

Hide file tree

Showing 130 changed files with 256 additions and 256 deletions.
diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
@@ -6891,7 +6891,7 @@
 			repositoryURL = "https://github.com/element-hq/compound-ios";
 			requirement = {
 				kind = revision;
-				revision = b2d1227d8628a28dafb85ae057a8df4bb7279029;
+				revision = 98bd0ed412c29bd5b3762b673ca5720b6fb9d713;
 			};
 		};
 		F76A08D0EA29A07A54F4EB4D /* XCRemoteSwiftPackageReference "swift-collections" */ = {

diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -14,7 +14,7 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/element-hq/compound-ios",
       "state" : {
-        "revision" : "b2d1227d8628a28dafb85ae057a8df4bb7279029"
+        "revision" : "98bd0ed412c29bd5b3762b673ca5720b6fb9d713"
       }
     },
     {

diff --git a/ElementX/Sources/Other/SwiftUI/Views/PlaceholderAvatarImage.swift b/ElementX/Sources/Other/SwiftUI/Views/PlaceholderAvatarImage.swift
@@ -31,7 +31,7 @@ struct PlaceholderAvatarImage: View {
                 // This text's frame doesn't look right when redacted
                 if redactionReasons != .placeholder {
                     Text(textForImage)
-                        .foregroundColor(avatarColor?.foreground ?? .white)
+                        .foregroundColor(avatarColor?.text ?? .white)
                         .font(.system(size: geometry.size.width * 0.5625, weight: .semibold))
                         .minimumScaleFactor(0.001)
                         .frame(alignment: .center)
@@ -55,12 +55,12 @@ struct PlaceholderAvatarImage: View {
         return avatarColor?.background ?? .compound.iconPrimary
     }
 
-    private var avatarColor: AvatarColor? {
+    private var avatarColor: DecorativeColor? {
         guard let contentID else {
             return nil
         }
 
-        return Color.compound.avatarColor(for: contentID)
+        return Color.compound.decorativeColor(for: contentID)
     }
 }
 

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift
@@ -80,7 +80,7 @@ struct TimelineItemBubbledStylerView<Content: View>: View {
                 TimelineSenderAvatarView(timelineItem: timelineItem)
                 Text(timelineItem.sender.displayName ?? timelineItem.sender.id)
                     .font(.compound.bodySMSemibold)
-                    .foregroundColor(.compound.avatarColor(for: timelineItem.sender.id).foreground)
+                    .foregroundColor(.compound.decorativeColor(for: timelineItem.sender.id).text)
                     .lineLimit(1)
                     .scaledPadding(.vertical, 3)
             }

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift
@@ -98,7 +98,7 @@ struct TimelineItemPlainStylerView<Content: View>: View {
                     TimelineSenderAvatarView(timelineItem: timelineItem)
                     Text(timelineItem.sender.displayName ?? timelineItem.sender.id)
                         .font(.subheadline)
-                        .foregroundColor(.compound.avatarColor(for: timelineItem.sender.id).foreground)
+                        .foregroundColor(.compound.decorativeColor(for: timelineItem.sender.id).text)
                         .fontWeight(.semibold)
                         .lineLimit(1)
                 }

diff --git a/...ces/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-1.png b/...ces/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-1.png
diff --git a/...ces/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-2.png b/...ces/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-2.png
diff --git a/...ces/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-3.png b/...ces/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-3.png
diff --git a/.../__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreenRTE-1.png b/.../__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreenRTE-1.png
diff --git a/.../__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreenRTE-2.png b/.../__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreenRTE-2.png
diff --git a/.../__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreenReply.png b/.../__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreenReply.png
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomDetailsScreen.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomDetailsScreen.png
diff --git a/...urces/__Snapshots__/Application/en-GB-iPhone-14.roomDetailsScreenWithInvite.png b/...urces/__Snapshots__/Application/en-GB-iPhone-14.roomDetailsScreenWithInvite.png
diff --git a/...s/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomEncryptedWithAvatar.png b/...s/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomEncryptedWithAvatar.png
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomLayoutBottom-0.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomLayoutBottom-0.png
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomLayoutTop.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomLayoutTop.png
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomMemberDetails.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomMemberDetails.png
diff --git a/...rces/__Snapshots__/Application/en-GB-iPhone-14.roomMemberDetailsIgnoredUser.png b/...rces/__Snapshots__/Application/en-GB-iPhone-14.roomMemberDetailsIgnoredUser.png
diff --git a/...sts/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomMembersListScreen.png b/...sts/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomMembersListScreen.png
diff --git a/...Snapshots__/Application/en-GB-iPhone-14.roomMembersListScreenPendingInvites.png b/...Snapshots__/Application/en-GB-iPhone-14.roomMembersListScreenPendingInvites.png
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomPlainNoAvatar.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomPlainNoAvatar.png
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-1.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-1.png
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-2.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-2.png
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-3.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-3.png
diff --git a/...ts/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreenRTE-1.png b/...ts/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreenRTE-1.png
diff --git a/...ts/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreenRTE-2.png b/...ts/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreenRTE-2.png
diff --git a/...ts/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreenReply.png b/...ts/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreenReply.png
diff --git a/...es/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-1.png b/...es/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-1.png
diff --git a/...es/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-2.png b/...es/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-2.png
diff --git a/...es/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-3.png b/...es/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-3.png
diff --git a/...__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreenRTE-1.png b/...__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreenRTE-1.png
diff --git a/...__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreenRTE-2.png b/...__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreenRTE-2.png
diff --git a/...__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreenReply.png b/...__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreenReply.png
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomDetailsScreen.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomDetailsScreen.png
diff --git a/...rces/__Snapshots__/Application/pseudo-iPhone-14.roomDetailsScreenWithInvite.png b/...rces/__Snapshots__/Application/pseudo-iPhone-14.roomDetailsScreenWithInvite.png
diff --git a/.../Sources/__Snapshots__/Application/pseudo-iPhone-14.roomEncryptedWithAvatar.png b/.../Sources/__Snapshots__/Application/pseudo-iPhone-14.roomEncryptedWithAvatar.png
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomLayoutBottom-0.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomLayoutBottom-0.png
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomLayoutTop.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomLayoutTop.png
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomMemberDetails.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomMemberDetails.png
diff --git a/...ces/__Snapshots__/Application/pseudo-iPhone-14.roomMemberDetailsIgnoredUser.png b/...ces/__Snapshots__/Application/pseudo-iPhone-14.roomMemberDetailsIgnoredUser.png
diff --git a/...ts/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomMembersListScreen.png b/...ts/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomMembersListScreen.png
diff --git a/...napshots__/Application/pseudo-iPhone-14.roomMembersListScreenPendingInvites.png b/...napshots__/Application/pseudo-iPhone-14.roomMembersListScreenPendingInvites.png
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomPlainNoAvatar.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomPlainNoAvatar.png
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-1.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-1.png
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-2.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-2.png
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-3.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-3.png
diff --git a/...s/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreenRTE-1.png b/...s/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreenRTE-1.png
diff --git a/...s/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreenRTE-2.png b/...s/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreenRTE-2.png
diff --git a/...s/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreenReply.png b/...s/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreenReply.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_audioRoomTimelineView.1.png b/UnitTests/__Snapshots__/PreviewTests/test_audioRoomTimelineView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_audioRoomTimelineView.2.png b/UnitTests/__Snapshots__/PreviewTests/test_audioRoomTimelineView.2.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_completionSuggestion.1.png b/UnitTests/__Snapshots__/PreviewTests/test_completionSuggestion.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_completionSuggestion.2.png b/UnitTests/__Snapshots__/PreviewTests/test_completionSuggestion.2.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_composerToolbar.With-Suggestions.png b/UnitTests/__Snapshots__/PreviewTests/test_composerToolbar.With-Suggestions.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_createRoom.Create-Room.png b/UnitTests/__Snapshots__/PreviewTests/test_createRoom.Create-Room.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_emoteRoomTimelineView.1.png b/UnitTests/__Snapshots__/PreviewTests/test_emoteRoomTimelineView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_emoteRoomTimelineView.2.png b/UnitTests/__Snapshots__/PreviewTests/test_emoteRoomTimelineView.2.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_encryptedRoomTimelineView.1.png b/UnitTests/__Snapshots__/PreviewTests/test_encryptedRoomTimelineView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_encryptedRoomTimelineView.2.png b/UnitTests/__Snapshots__/PreviewTests/test_encryptedRoomTimelineView.2.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_fileRoomTimelineView.1.png b/UnitTests/__Snapshots__/PreviewTests/test_fileRoomTimelineView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_fileRoomTimelineView.2.png b/UnitTests/__Snapshots__/PreviewTests/test_fileRoomTimelineView.2.png