Update compound (#3519)

* Update compound textPlaceholder is now textSecondary. * Update compound again with support for button shapes on the plain button style.
element-hq · Nov 15, 2024 · c888a5b · c888a5b
1 parent ef288a9
commit c888a5b
Show file tree

Hide file tree

Showing 150 changed files with 295 additions and 295 deletions.
diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
@@ -8249,7 +8249,7 @@
 			repositoryURL = "https://github.com/element-hq/compound-ios";
 			requirement = {
 				kind = revision;
-				revision = 950a8884e269194e6030cbddabebbb116cdfe02a;
+				revision = 4af41551fb7a7b9da0fd95171f2dec554726fadd;
 			};
 		};
 		F76A08D0EA29A07A54F4EB4D /* XCRemoteSwiftPackageReference "swift-collections" */ = {

diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -6,16 +6,16 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/element-hq/compound-design-tokens",
       "state" : {
-        "revision" : "f9510e9d309b5aeefe9a7ef6b8c073c84337d4e9",
-        "version" : "1.9.1"
+        "revision" : "6190515a2af1eb1cb02114270fd536f1b6daa518",
+        "version" : "2.0.1"
       }
     },
     {
       "identity" : "compound-ios",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/element-hq/compound-ios",
       "state" : {
-        "revision" : "950a8884e269194e6030cbddabebbb116cdfe02a"
+        "revision" : "4af41551fb7a7b9da0fd95171f2dec554726fadd"
       }
     },
     {

diff --git a/ElementX/Sources/Other/SwiftUI/Views/SFNumberedListView.swift b/ElementX/Sources/Other/SwiftUI/Views/SFNumberedListView.swift
@@ -21,7 +21,7 @@ struct SFNumberedListView: View {
                     Image(systemSymbol: getSymbol(for: index))
                         .imageScale(.large)
                         .fontWeight(.light)
-                        .foregroundColor(.compound.textPlaceholder)
+                        .foregroundColor(.compound.textSecondary)
                 }
                 .foregroundColor(.compound.textPrimary)
                 .font(.compound.bodyMD)

diff --git a/ElementX/Sources/Screens/Authentication/AuthenticationTextFieldStyle.swift b/ElementX/Sources/Screens/Authentication/AuthenticationTextFieldStyle.swift
@@ -68,7 +68,7 @@ public struct AuthenticationTextFieldStyle: TextFieldStyle {
 
     /// The color of the placeholder text inside the text field.
     private var placeholderColor: UIColor {
-        .compound.textPlaceholder
+        .compound.textSecondary
     }
 
     /// The color of the label above the text field.

diff --git a/ElementX/Sources/Screens/Authentication/LoginScreen/View/LoginScreen.swift b/ElementX/Sources/Screens/Authentication/LoginScreen/View/LoginScreen.swift
@@ -66,7 +66,7 @@ struct LoginScreen: View {
                 .padding(.bottom, 8)
 
             TextField(text: $context.username) {
-                Text(L10n.commonUsername).foregroundColor(.compound.textPlaceholder)
+                Text(L10n.commonUsername).foregroundColor(.compound.textSecondary)
             }
             .focused($isUsernameFocused)
             .textFieldStyle(.authentication(accessibilityIdentifier: A11yIdentifiers.loginScreen.emailUsername))
@@ -81,7 +81,7 @@ struct LoginScreen: View {
             .padding(.bottom, 20)
 
             SecureField(text: $context.password) {
-                Text(L10n.commonPassword).foregroundColor(.compound.textPlaceholder)
+                Text(L10n.commonPassword).foregroundColor(.compound.textSecondary)
             }
             .focused($isPasswordFocused)
             .textFieldStyle(.authentication(accessibilityIdentifier: A11yIdentifiers.loginScreen.password))

diff --git a/ElementX/Sources/Screens/CreateRoom/View/CreateRoomScreen.swift b/ElementX/Sources/Screens/CreateRoom/View/CreateRoomScreen.swift
@@ -66,7 +66,7 @@ struct CreateRoomScreen: View {
 
                     TextField(L10n.screenCreateRoomRoomNameLabel,
                               text: roomNameBinding,
-                              prompt: Text(L10n.commonRoomNamePlaceholder).foregroundColor(.compound.textPlaceholder),
+                              prompt: Text(L10n.commonRoomNamePlaceholder).foregroundColor(.compound.textSecondary),
                               axis: .horizontal)
                         .focused($focus, equals: .name)
                         .accessibilityIdentifier(A11yIdentifiers.createRoomScreen.roomName)

diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenInviteCell.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenInviteCell.swift
@@ -73,7 +73,7 @@ struct HomeScreenInviteCell: View {
            !room.isDirect {
             RoomInviterLabel(inviter: inviter, mediaProvider: context.mediaProvider)
                 .font(.compound.bodyMD)
-                .foregroundStyle(.compound.textPlaceholder)
+                .foregroundStyle(.compound.textSecondary)
         }
     }
 
@@ -88,7 +88,7 @@ struct HomeScreenInviteCell: View {
             if let subtitle {
                 Text(subtitle)
                     .font(.compound.bodyMD)
-                    .foregroundColor(.compound.textPlaceholder)
+                    .foregroundColor(.compound.textSecondary)
             }
         }
         .frame(maxWidth: .infinity, alignment: .leading)

diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenKnockedCell.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenKnockedCell.swift
@@ -56,7 +56,7 @@ struct HomeScreenKnockedCell: View {
 
                 Text(L10n.screenRoomlistKnockEventSentDescription)
                     .font(.compound.bodyMD)
-                    .foregroundStyle(.compound.textPlaceholder)
+                    .foregroundStyle(.compound.textSecondary)
                     .padding(.top, room.canonicalAlias == nil ? 0 : 4)
                     .padding(.trailing, 16)
             }
@@ -76,7 +76,7 @@ struct HomeScreenKnockedCell: View {
             if let subtitle {
                 Text(subtitle)
                     .font(.compound.bodyMD)
-                    .foregroundColor(.compound.textPlaceholder)
+                    .foregroundColor(.compound.textSecondary)
             }
         }
         .frame(maxWidth: .infinity, alignment: .leading)

diff --git a/ElementX/Sources/Screens/Timeline/View/TypingIndicatorView.swift b/ElementX/Sources/Screens/Timeline/View/TypingIndicatorView.swift
@@ -14,7 +14,7 @@ struct TypingIndicatorView: View {
     var body: some View {
         content
             .font(.compound.bodySM)
-            .foregroundColor(.compound.textPlaceholder)
+            .foregroundColor(.compound.textSecondary)
             .lineLimit(1)
             .truncationMode(.middle)
             .padding(.horizontal, 4)

diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_bugReport-iPad-en-GB.1.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_bugReport-iPad-en-GB.1.png
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_bugReport-iPad-en-GB.2.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_bugReport-iPad-en-GB.2.png
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_bugReport-iPad-pseudo.1.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_bugReport-iPad-pseudo.1.png
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_bugReport-iPad-pseudo.2.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_bugReport-iPad-pseudo.2.png
diff --git a/...ewTests/Sources/__Snapshots__/PreviewTests/test_bugReport-iPhone-16-en-GB.1.png b/...ewTests/Sources/__Snapshots__/PreviewTests/test_bugReport-iPhone-16-en-GB.1.png
diff --git a/...ewTests/Sources/__Snapshots__/PreviewTests/test_bugReport-iPhone-16-en-GB.2.png b/...ewTests/Sources/__Snapshots__/PreviewTests/test_bugReport-iPhone-16-en-GB.2.png
diff --git a/...wTests/Sources/__Snapshots__/PreviewTests/test_bugReport-iPhone-16-pseudo.1.png b/...wTests/Sources/__Snapshots__/PreviewTests/test_bugReport-iPhone-16-pseudo.1.png
diff --git a/...wTests/Sources/__Snapshots__/PreviewTests/test_bugReport-iPhone-16-pseudo.2.png b/...wTests/Sources/__Snapshots__/PreviewTests/test_bugReport-iPhone-16-pseudo.2.png
diff --git a/..._/PreviewTests/test_createRoom-iPad-en-GB.Create-Public-Room-existing-alias.png b/..._/PreviewTests/test_createRoom-iPad-en-GB.Create-Public-Room-existing-alias.png
diff --git a/...__/PreviewTests/test_createRoom-iPad-en-GB.Create-Public-Room-invalid-alias.png b/...__/PreviewTests/test_createRoom-iPad-en-GB.Create-Public-Room-invalid-alias.png
diff --git a/...es/__Snapshots__/PreviewTests/test_createRoom-iPad-en-GB.Create-Public-Room.png b/...es/__Snapshots__/PreviewTests/test_createRoom-iPad-en-GB.Create-Public-Room.png
diff --git a/...apshots__/PreviewTests/test_createRoom-iPad-en-GB.Create-Room-without-users.png b/...apshots__/PreviewTests/test_createRoom-iPad-en-GB.Create-Room-without-users.png
diff --git a/...s/Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-en-GB.Create-Room.png b/...s/Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-en-GB.Create-Room.png
diff --git a/.../PreviewTests/test_createRoom-iPad-pseudo.Create-Public-Room-existing-alias.png b/.../PreviewTests/test_createRoom-iPad-pseudo.Create-Public-Room-existing-alias.png
diff --git a/..._/PreviewTests/test_createRoom-iPad-pseudo.Create-Public-Room-invalid-alias.png b/..._/PreviewTests/test_createRoom-iPad-pseudo.Create-Public-Room-invalid-alias.png
diff --git a/...s/__Snapshots__/PreviewTests/test_createRoom-iPad-pseudo.Create-Public-Room.png b/...s/__Snapshots__/PreviewTests/test_createRoom-iPad-pseudo.Create-Public-Room.png
diff --git a/...pshots__/PreviewTests/test_createRoom-iPad-pseudo.Create-Room-without-users.png b/...pshots__/PreviewTests/test_createRoom-iPad-pseudo.Create-Room-without-users.png
diff --git a/.../Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-pseudo.Create-Room.png b/.../Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-pseudo.Create-Room.png
diff --git a/...viewTests/test_createRoom-iPhone-16-en-GB.Create-Public-Room-existing-alias.png b/...viewTests/test_createRoom-iPhone-16-en-GB.Create-Public-Room-existing-alias.png
diff --git a/...eviewTests/test_createRoom-iPhone-16-en-GB.Create-Public-Room-invalid-alias.png b/...eviewTests/test_createRoom-iPhone-16-en-GB.Create-Public-Room-invalid-alias.png
diff --git a/...Snapshots__/PreviewTests/test_createRoom-iPhone-16-en-GB.Create-Public-Room.png b/...Snapshots__/PreviewTests/test_createRoom-iPhone-16-en-GB.Create-Public-Room.png
diff --git a/...ts__/PreviewTests/test_createRoom-iPhone-16-en-GB.Create-Room-without-users.png b/...ts__/PreviewTests/test_createRoom-iPhone-16-en-GB.Create-Room-without-users.png
diff --git a/...rces/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-en-GB.Create-Room.png b/...rces/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-en-GB.Create-Room.png
diff --git a/...iewTests/test_createRoom-iPhone-16-pseudo.Create-Public-Room-existing-alias.png b/...iewTests/test_createRoom-iPhone-16-pseudo.Create-Public-Room-existing-alias.png
diff --git a/...viewTests/test_createRoom-iPhone-16-pseudo.Create-Public-Room-invalid-alias.png b/...viewTests/test_createRoom-iPhone-16-pseudo.Create-Public-Room-invalid-alias.png
diff --git a/...napshots__/PreviewTests/test_createRoom-iPhone-16-pseudo.Create-Public-Room.png b/...napshots__/PreviewTests/test_createRoom-iPhone-16-pseudo.Create-Public-Room.png
diff --git a/...s__/PreviewTests/test_createRoom-iPhone-16-pseudo.Create-Room-without-users.png b/...s__/PreviewTests/test_createRoom-iPhone-16-pseudo.Create-Room-without-users.png
diff --git a/...ces/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-pseudo.Create-Room.png b/...ces/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-pseudo.Create-Room.png
diff --git a/...ources/__Snapshots__/PreviewTests/test_deactivateAccountScreen-iPad-en-GB.1.png b/...ources/__Snapshots__/PreviewTests/test_deactivateAccountScreen-iPad-en-GB.1.png
diff --git a/...urces/__Snapshots__/PreviewTests/test_deactivateAccountScreen-iPad-pseudo.1.png b/...urces/__Snapshots__/PreviewTests/test_deactivateAccountScreen-iPad-pseudo.1.png
diff --git a/...s/__Snapshots__/PreviewTests/test_deactivateAccountScreen-iPhone-16-en-GB.1.png b/...s/__Snapshots__/PreviewTests/test_deactivateAccountScreen-iPhone-16-en-GB.1.png
diff --git a/.../__Snapshots__/PreviewTests/test_deactivateAccountScreen-iPhone-16-pseudo.1.png b/.../__Snapshots__/PreviewTests/test_deactivateAccountScreen-iPhone-16-pseudo.1.png
diff --git a/...Sources/__Snapshots__/PreviewTests/test_emojiPickerScreen-iPad-en-GB.Screen.png b/...Sources/__Snapshots__/PreviewTests/test_emojiPickerScreen-iPad-en-GB.Screen.png
diff --git a/...ources/__Snapshots__/PreviewTests/test_emojiPickerScreen-iPad-pseudo.Screen.png b/...ources/__Snapshots__/PreviewTests/test_emojiPickerScreen-iPad-pseudo.Screen.png
diff --git a/...es/__Snapshots__/PreviewTests/test_emojiPickerScreen-iPhone-16-en-GB.Screen.png b/...es/__Snapshots__/PreviewTests/test_emojiPickerScreen-iPhone-16-en-GB.Screen.png
diff --git a/...s/__Snapshots__/PreviewTests/test_emojiPickerScreen-iPhone-16-pseudo.Screen.png b/...s/__Snapshots__/PreviewTests/test_emojiPickerScreen-iPhone-16-pseudo.Screen.png
diff --git a/...wTests/Sources/__Snapshots__/PreviewTests/test_homeScreen-iPad-en-GB.Loaded.png b/...wTests/Sources/__Snapshots__/PreviewTests/test_homeScreen-iPad-en-GB.Loaded.png
diff --git a/...Tests/Sources/__Snapshots__/PreviewTests/test_homeScreen-iPad-pseudo.Loaded.png b/...Tests/Sources/__Snapshots__/PreviewTests/test_homeScreen-iPad-pseudo.Loaded.png
diff --git a/...s/Sources/__Snapshots__/PreviewTests/test_homeScreen-iPhone-16-en-GB.Loaded.png b/...s/Sources/__Snapshots__/PreviewTests/test_homeScreen-iPhone-16-en-GB.Loaded.png
diff --git a/.../Sources/__Snapshots__/PreviewTests/test_homeScreen-iPhone-16-pseudo.Loaded.png b/.../Sources/__Snapshots__/PreviewTests/test_homeScreen-iPhone-16-pseudo.Loaded.png
diff --git a/...s/Sources/__Snapshots__/PreviewTests/test_homeScreenInviteCell-iPad-en-GB.1.png b/...s/Sources/__Snapshots__/PreviewTests/test_homeScreenInviteCell-iPad-en-GB.1.png
diff --git a/.../Sources/__Snapshots__/PreviewTests/test_homeScreenInviteCell-iPad-pseudo.1.png b/.../Sources/__Snapshots__/PreviewTests/test_homeScreenInviteCell-iPad-pseudo.1.png
diff --git a/...rces/__Snapshots__/PreviewTests/test_homeScreenInviteCell-iPhone-16-en-GB.1.png b/...rces/__Snapshots__/PreviewTests/test_homeScreenInviteCell-iPhone-16-en-GB.1.png
diff --git a/...ces/__Snapshots__/PreviewTests/test_homeScreenInviteCell-iPhone-16-pseudo.1.png b/...ces/__Snapshots__/PreviewTests/test_homeScreenInviteCell-iPhone-16-pseudo.1.png
diff --git a/.../Sources/__Snapshots__/PreviewTests/test_homeScreenKnockedCell-iPad-en-GB.1.png b/.../Sources/__Snapshots__/PreviewTests/test_homeScreenKnockedCell-iPad-en-GB.1.png
diff --git a/...Sources/__Snapshots__/PreviewTests/test_homeScreenKnockedCell-iPad-pseudo.1.png b/...Sources/__Snapshots__/PreviewTests/test_homeScreenKnockedCell-iPad-pseudo.1.png