diff --git a/ElementX/Resources/Assets.xcassets/colors/brand-color.colorset/Contents.json b/ElementX/Resources/Assets.xcassets/colors/brand-color.colorset/Contents.json deleted file mode 100644 index a4c58239ed..0000000000 --- a/ElementX/Resources/Assets.xcassets/colors/brand-color.colorset/Contents.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0.545", - "green" : "0.741", - "red" : "0.051" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ElementX/Resources/Assets.xcassets/colors/grabber.colorset/Contents.json b/ElementX/Resources/Assets.xcassets/colors/grabber.colorset/Contents.json deleted file mode 100644 index 3b150a2f66..0000000000 --- a/ElementX/Resources/Assets.xcassets/colors/grabber.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "199", - "green" : "197", - "red" : "197" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "89", - "green" : "83", - "red" : "81" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ElementX/Resources/Assets.xcassets/images/home/Contents.json b/ElementX/Resources/Assets.xcassets/images/home/Contents.json deleted file mode 100644 index 73c00596a7..0000000000 --- a/ElementX/Resources/Assets.xcassets/images/home/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ElementX/Resources/Assets.xcassets/images/home/settings-icon-with-badge.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/home/settings-icon-with-badge.imageset/Contents.json deleted file mode 100644 index ce09911da2..0000000000 --- a/ElementX/Resources/Assets.xcassets/images/home/settings-icon-with-badge.imageset/Contents.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "images" : [ - { - "filename" : "settings-icon-with-badge-light 1.svg", - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "filename" : "settings-icon-with-badge-dark 1.svg", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true - } -} diff --git a/ElementX/Resources/Assets.xcassets/images/home/settings-icon-with-badge.imageset/settings-icon-with-badge-dark 1.svg b/ElementX/Resources/Assets.xcassets/images/home/settings-icon-with-badge.imageset/settings-icon-with-badge-dark 1.svg deleted file mode 100644 index b921ea8df5..0000000000 --- a/ElementX/Resources/Assets.xcassets/images/home/settings-icon-with-badge.imageset/settings-icon-with-badge-dark 1.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/ElementX/Resources/Assets.xcassets/images/home/settings-icon-with-badge.imageset/settings-icon-with-badge-light 1.svg b/ElementX/Resources/Assets.xcassets/images/home/settings-icon-with-badge.imageset/settings-icon-with-badge-light 1.svg deleted file mode 100644 index 814c2c1042..0000000000 --- a/ElementX/Resources/Assets.xcassets/images/home/settings-icon-with-badge.imageset/settings-icon-with-badge-light 1.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/ElementX/Resources/Assets.xcassets/images/join-room-background.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/join-room-background.imageset/Contents.json deleted file mode 100644 index 8dfc8b699a..0000000000 --- a/ElementX/Resources/Assets.xcassets/images/join-room-background.imageset/Contents.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "images" : [ - { - "filename" : "join-room-background.svg", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true - } -} diff --git a/ElementX/Resources/Assets.xcassets/images/join-room-background.imageset/join-room-background.svg b/ElementX/Resources/Assets.xcassets/images/join-room-background.imageset/join-room-background.svg deleted file mode 100644 index 6bdccf6d56..0000000000 --- a/ElementX/Resources/Assets.xcassets/images/join-room-background.imageset/join-room-background.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/ElementX/Resources/Assets.xcassets/images/waiting-gradient.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/waiting-gradient.imageset/Contents.json deleted file mode 100644 index 99a2120a04..0000000000 --- a/ElementX/Resources/Assets.xcassets/images/waiting-gradient.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "filename" : "medium-light-dark.png", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ElementX/Resources/Assets.xcassets/images/waiting-gradient.imageset/medium-light-dark.png b/ElementX/Resources/Assets.xcassets/images/waiting-gradient.imageset/medium-light-dark.png deleted file mode 100644 index 71c826afc1..0000000000 Binary files a/ElementX/Resources/Assets.xcassets/images/waiting-gradient.imageset/medium-light-dark.png and /dev/null differ diff --git a/ElementX/Sources/Generated/Assets.swift b/ElementX/Sources/Generated/Assets.swift index 5e21a8033d..ce9f069eee 100644 --- a/ElementX/Sources/Generated/Assets.swift +++ b/ElementX/Sources/Generated/Assets.swift @@ -27,8 +27,6 @@ internal enum Asset { internal enum Colors { internal static let accentColor = ColorAsset(name: "colors/accent-color") internal static let backgroundColor = ColorAsset(name: "colors/background-color") - internal static let brandColor = ColorAsset(name: "colors/brand-color") - internal static let grabber = ColorAsset(name: "colors/grabber") } internal enum Images { internal static let appLogo = ImageAsset(name: "images/app-logo") @@ -37,15 +35,12 @@ internal enum Asset { internal static let closeRte = ImageAsset(name: "images/close-rte") internal static let composerAttachment = ImageAsset(name: "images/composer-attachment") internal static let stopRecording = ImageAsset(name: "images/stop-recording") - internal static let settingsIconWithBadge = ImageAsset(name: "images/settings-icon-with-badge") - internal static let joinRoomBackground = ImageAsset(name: "images/join-room-background") internal static let launchBackground = ImageAsset(name: "images/launch-background") internal static let locationMarkerShape = ImageAsset(name: "images/location-marker-shape") internal static let mediaPause = ImageAsset(name: "images/media-pause") internal static let mediaPlay = ImageAsset(name: "images/media-play") internal static let notificationsPromptGraphic = ImageAsset(name: "images/notifications-prompt-graphic") internal static let pollWinner = ImageAsset(name: "images/poll-winner") - internal static let waitingGradient = ImageAsset(name: "images/waiting-gradient") } } // swiftlint:enable identifier_name line_length nesting type_body_length type_name diff --git a/ElementX/Sources/Other/SwiftUI/Layout/FullscreenDialog.swift b/ElementX/Sources/Other/SwiftUI/Layout/FullscreenDialog.swift index 7244010d9a..df6859004d 100644 --- a/ElementX/Sources/Other/SwiftUI/Layout/FullscreenDialog.swift +++ b/ElementX/Sources/Other/SwiftUI/Layout/FullscreenDialog.swift @@ -148,15 +148,11 @@ struct FullscreenDialog: View { enum FullscreenDialogBackground { /// The bottom gradient from the FTUE flow. case gradient - /// The subtle bloom from the room discovery and permalink flows. - case bloom private var asset: ImageAsset { switch self { case .gradient: Asset.Images.backgroundBottom - case .bloom: - Asset.Images.joinRoomBackground } } @@ -164,8 +160,6 @@ enum FullscreenDialogBackground { switch self { case .gradient: EdgeInsets(top: 0, leading: 0, bottom: 250, trailing: 0) - case .bloom: - EdgeInsets() // This one covers the entire screen. } } @@ -195,15 +189,6 @@ struct FullscreenDialog_Previews: PreviewProvider, TestablePreview { .background() .backgroundStyle(.compound.bgCanvasDefault) .previewDisplayName("Gradient") - - FullscreenDialog(topPadding: UIConstants.iconTopPaddingToNavigationBar, background: .bloom) { - content - } bottomContent: { - buttons - } - .background() - .backgroundStyle(.compound.bgCanvasDefault) - .previewDisplayName("Bloom") } private static var content: some View { diff --git a/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/MessageComposer.swift b/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/MessageComposer.swift index 0bbf37fcaa..ebb8decb22 100644 --- a/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/MessageComposer.swift +++ b/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/MessageComposer.swift @@ -91,7 +91,7 @@ struct MessageComposer: View { private var resizeGrabber: some View { Capsule() - .foregroundColor(Asset.Colors.grabber.swiftUIColor) + .foregroundStyle(.tertiary) .frame(width: 36, height: 5) .padding(.vertical, 8) .frame(maxWidth: .infinity) diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_fullscreenDialog-iPad-en-GB.Bloom.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_fullscreenDialog-iPad-en-GB.Bloom.png deleted file mode 100644 index 311bf2178a..0000000000 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_fullscreenDialog-iPad-en-GB.Bloom.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:673ae32a0c035cbe1e6da82e5140dc8a8420809162191c184469d7740eadb78e -size 1920581 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_fullscreenDialog-iPad-pseudo.Bloom.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_fullscreenDialog-iPad-pseudo.Bloom.png deleted file mode 100644 index 784899d4e2..0000000000 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_fullscreenDialog-iPad-pseudo.Bloom.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:141ac92b6df2462b2c6c9a4fd79c43e8e93b20ce6258e4c29d042bd0b7cff0a1 -size 1940834 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_fullscreenDialog-iPhone-16-en-GB.Bloom.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_fullscreenDialog-iPhone-16-en-GB.Bloom.png deleted file mode 100644 index c6762375b4..0000000000 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_fullscreenDialog-iPhone-16-en-GB.Bloom.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:79a9b654dce63490f300e49dc1b555858ad1998f615572fb90df7743bfd39f65 -size 779384 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_fullscreenDialog-iPhone-16-pseudo.Bloom.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_fullscreenDialog-iPhone-16-pseudo.Bloom.png deleted file mode 100644 index 1d145a59c7..0000000000 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_fullscreenDialog-iPhone-16-pseudo.Bloom.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa13af20da0e71c18721b1391c7bf114b7fb7b9bff5436b8ea300b406a6cdb1d -size 802263