swift/Beam
swift/Beam
1
0
Fork 0
mirror of https://github.com/element-hq/element-x-ios.git synced 2025-03-10 21:39:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused/redundant assets. (#3702)

Browse Source 
* Remove unused image assets.

* Remove unused/redundant colour assets.
This commit is contained in:
Doug 2025-01-27 11:44:39 +00:00 committed by GitHub
parent 62611be006
commit b477a32d2e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
17 changed files with 1 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ElementX/Resources/Assets.xcassets/colors/brand-color.colorset/Contents.json
View File

@ -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
}
}

38
ElementX/Resources/Assets.xcassets/colors/grabber.colorset/Contents.json
View File

@ -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
}
}

6
ElementX/Resources/Assets.xcassets/images/home/Contents.json
View File

@ -1,6 +0,0 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}

25
ElementX/Resources/Assets.xcassets/images/home/settings-icon-with-badge.imageset/Contents.json vendored
View File

@ -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
}
}

4
ElementX/Resources/Assets.xcassets/images/home/settings-icon-with-badge.imageset/settings-icon-with-badge-dark 1.svg vendored
View File

@ -1,4 +0,0 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M21.7771 10.32C21.92 10.6205 22 10.9568 22 11.3117V12.6883C22 13.965 20.965 15 19.6883 15H19.4412L19.4381 15.0022C19.4245 15.012 19.4047 15.0334 19.3913 15.0657C19.3784 15.0966 19.3781 15.1223 19.3802 15.1352L19.3808 15.1381L19.5578 15.3151C20.4605 16.2179 20.4605 17.6816 19.5578 18.5844L18.5844 19.5577C17.6816 20.4605 16.2179 20.4605 15.3151 19.5577L15.1381 19.3807L15.1353 19.3802C15.1223 19.3781 15.0966 19.3784 15.0657 19.3913C15.0335 19.4047 15.012 19.4245 15.0022 19.4381L15 19.4412V19.6883C15 20.965 13.965 22 12.6883 22H11.3117C10.035 22 9 20.965 9 19.6883V19.4412L8.99783 19.4381C8.98796 19.4245 8.96656 19.4047 8.93432 19.3913C8.9034 19.3784 8.87773 19.3781 8.86475 19.3802L8.8619 19.3807L8.6849 19.5577C7.78211 20.4605 6.3184 20.4605 5.41562 19.5577L4.44226 18.5844C3.53947 17.6816 3.53947 16.2179 4.44226 15.3151L4.61926 15.1381L4.6198 15.1353C4.62191 15.1223 4.62157 15.0966 4.60873 15.0657C4.59535 15.0334 4.57554 15.012 4.56195 15.0022L4.55877 15H4.3117C3.03498 15 2 13.965 2 12.6883V11.3117C2 10.035 3.03498 9 4.3117 9H4.55876L4.56195 8.99782C4.57554 8.98796 4.59535 8.96655 4.60874 8.93431C4.62158 8.90339 4.62192 8.87771 4.6198 8.86472L4.61926 8.86187L4.44226 8.68487C3.53947 7.78208 3.53947 6.31837 4.44226 5.41559L5.41561 4.44224C6.3184 3.53945 7.78211 3.53945 8.68491 4.44224L8.86192 4.61925L8.86476 4.61979C8.87774 4.6219 8.90341 4.62156 8.93433 4.60873C8.96657 4.59534 8.98797 4.57553 8.99783 4.56194L9 4.55877V4.3117C9 3.03498 10.035 2 11.3117 2H12.6883C13.0432 2 13.3795 2.07999 13.68 2.22292C13.2855 2.97714 13.0466 3.82566 13.0062 4.72582C13.0021 4.67418 13 4.62181 13 4.56876V4.3117C13 4.13955 12.8605 4 12.6883 4H11.3117C11.1396 4 11 4.13955 11 4.3117V4.56877C11 5.46192 10.4097 6.16172 9.70122 6.45585C8.98451 6.75342 8.07949 6.66525 7.45258 6.03834L7.27069 5.85645C7.14895 5.73471 6.95157 5.73471 6.82982 5.85645L5.85647 6.8298C5.73473 6.95154 5.73473 7.14892 5.85647 7.27066L6.03835 7.45253C6.66527 8.07945 6.75343 8.98448 6.45586 9.7012C6.16173 10.4097 5.46192 11 4.56876 11H4.3117C4.13955 11 4 11.1396 4 11.3117V12.6883C4 12.8604 4.13955 13 4.3117 13H4.56877C5.46192 13 6.16173 13.5903 6.45586 14.2988C6.75343 15.0155 6.66526 15.9205 6.03834 16.5474L5.85647 16.7293C5.73473 16.8511 5.73473 17.0484 5.85647 17.1702L6.82983 18.1435C6.95157 18.2653 7.14895 18.2653 7.27068 18.1435L7.45256 17.9617C8.07947 17.3347 8.9845 17.2466 9.70121 17.5441C10.4097 17.8383 11 18.5381 11 19.4312V19.6883C11 19.8604 11.1396 20 11.3117 20H12.6883C12.8605 20 13 19.8604 13 19.6883V19.4312C13 18.5381 13.5903 17.8383 14.2988 17.5441C15.0155 17.2466 15.9206 17.3347 16.5475 17.9617L16.7293 18.1435C16.8511 18.2653 17.0484 18.2653 17.1702 18.1435L18.1435 17.1701C18.2653 17.0484 18.2653 16.851 18.1435 16.7293L17.9617 16.5474C17.3348 15.9205 17.2466 15.0155 17.5442 14.2988C17.8383 13.5903 18.5381 13 19.4312 13H19.6883C19.8604 13 20 12.8604 20 12.6883V11.3117C20 11.1396 19.8604 11 19.6883 11H19.4312C19.3782 11 19.3258 10.9979 19.2741 10.9938C20.1743 10.9534 21.0229 10.7145 21.7771 10.32ZM15.2768 9.70541C15.7325 10.355 16 11.1463 16 12C16 14.2091 14.2091 16 12 16C9.79087 16 8.00001 14.2091 8.00001 12C8.00001 9.79086 9.79087 8 12 8C12.8537 8 13.645 8.26747 14.2946 8.72317C14.583 9.0872 14.9128 9.41698 15.2768 9.70541ZM12 10C13.1046 10 14 10.8954 14 12C14 13.1046 13.1046 14 12 14C10.8954 14 10 13.1046 10 12C10 10.8954 10.8954 10 12 10Z" fill="#EBEEF2"/>
<circle cx="19" cy="5" r="4" fill="#FD3E3C"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 3.5 KiB

4
ElementX/Resources/Assets.xcassets/images/home/settings-icon-with-badge.imageset/settings-icon-with-badge-light 1.svg vendored
View File

@ -1,4 +0,0 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M21.7771 10.32C21.92 10.6205 22 10.9568 22 11.3117V12.6883C22 13.965 20.965 15 19.6883 15H19.4412L19.4381 15.0022C19.4245 15.012 19.4047 15.0334 19.3913 15.0657C19.3784 15.0966 19.3781 15.1223 19.3802 15.1352L19.3807 15.1381L19.5578 15.3151C20.4605 16.2179 20.4605 17.6816 19.5577 18.5844L18.5844 19.5577C17.6816 20.4605 16.2179 20.4605 15.3151 19.5577L15.1381 19.3807L15.1353 19.3802C15.1223 19.3781 15.0966 19.3784 15.0657 19.3913C15.0334 19.4047 15.012 19.4245 15.0022 19.4381L15 19.4412V19.6883C15 20.965 13.965 22 12.6883 22H11.3117C10.035 22 9 20.965 9 19.6883V19.4412L8.99782 19.4381C8.98796 19.4245 8.96656 19.4047 8.93432 19.3913C8.90339 19.3784 8.87772 19.3781 8.86474 19.3802L8.86189 19.3807L8.68489 19.5577C7.7821 20.4605 6.3184 20.4605 5.41561 19.5577L4.44225 18.5844C3.53946 17.6816 3.53946 16.2179 4.44225 15.3151L4.61925 15.1381L4.61979 15.1353C4.62191 15.1223 4.62157 15.0966 4.60873 15.0657C4.59534 15.0334 4.57553 15.012 4.56194 15.0022L4.55876 15H4.3117C3.03498 15 1.99999 13.965 1.99999 12.6883V11.3117C1.99999 10.035 3.03498 9 4.3117 9H4.55876L4.56194 8.99782C4.57553 8.98796 4.59534 8.96655 4.60873 8.93431C4.62157 8.90339 4.62191 8.87771 4.6198 8.86472L4.61925 8.86187L4.44225 8.68487C3.53946 7.78208 3.53946 6.31837 4.44225 5.41559L5.4156 4.44224C6.31839 3.53945 7.78211 3.53945 8.6849 4.44224L8.86191 4.61925L8.86475 4.61979C8.87774 4.6219 8.9034 4.62156 8.93432 4.60873C8.96656 4.59534 8.98796 4.57553 8.99782 4.56194L9 4.55877V4.3117C9 3.03498 10.035 2 11.3117 2H12.6883C13.0432 2 13.3795 2.07999 13.68 2.22292C13.2855 2.97716 13.0466 3.8257 13.0062 4.72588C13.0021 4.67422 13 4.62183 13 4.56876V4.3117C13 4.13955 12.8604 4 12.6883 4H11.3117C11.1396 4 11 4.13955 11 4.3117V4.56877C11 5.46192 10.4097 6.16172 9.70121 6.45585C8.9845 6.75342 8.07948 6.66525 7.45257 6.03834L7.27069 5.85645C7.14894 5.73471 6.95156 5.73471 6.82981 5.85645L5.85647 6.8298C5.73473 6.95154 5.73473 7.14892 5.85647 7.27066L6.03834 7.45253C6.66526 8.07945 6.75343 8.98448 6.45586 9.7012C6.16172 10.4097 5.46191 11 4.56876 11H4.3117C4.13955 11 3.99999 11.1396 3.99999 11.3117V12.6883C3.99999 12.8604 4.13955 13 4.3117 13H4.56876C5.46191 13 6.16172 13.5903 6.45585 14.2988C6.75342 15.0155 6.66525 15.9205 6.03834 16.5474L5.85646 16.7293C5.73472 16.8511 5.73472 17.0484 5.85646 17.1702L6.82982 18.1435C6.95156 18.2653 7.14894 18.2653 7.27068 18.1435L7.45255 17.9617C8.07946 17.3347 8.98449 17.2466 9.70121 17.5441C10.4097 17.8383 11 18.5381 11 19.4312V19.6883C11 19.8604 11.1396 20 11.3117 20H12.6883C12.8604 20 13 19.8604 13 19.6883V19.4312C13 18.5381 13.5903 17.8383 14.2988 17.5441C15.0155 17.2466 15.9205 17.3347 16.5475 17.9617L16.7293 18.1435C16.8511 18.2653 17.0484 18.2653 17.1702 18.1435L18.1435 17.1701C18.2653 17.0484 18.2653 16.851 18.1435 16.7293L17.9617 16.5474C17.3348 15.9205 17.2466 15.0155 17.5441 14.2988C17.8383 13.5903 18.5381 13 19.4312 13H19.6883C19.8604 13 20 12.8604 20 12.6883V11.3117C20 11.1396 19.8604 11 19.6883 11H19.4312C19.3782 11 19.3258 10.9979 19.2741 10.9938C20.1743 10.9534 21.0228 10.7145 21.7771 10.32ZM15.2768 9.7054C15.7325 10.355 16 11.1463 16 12C16 14.2091 14.2091 16 12 16C9.79086 16 8 14.2091 8 12C8 9.79086 9.79086 8 12 8C12.8537 8 13.645 8.26747 14.2946 8.72318C14.583 9.08721 14.9128 9.41698 15.2768 9.7054ZM12 10C13.1046 10 14 10.8954 14 12C14 13.1046 13.1046 14 12 14C10.8954 14 10 13.1046 10 12C10 10.8954 10.8954 10 12 10Z" fill="#1B1D22"/>
<circle cx="19" cy="5" r="4" fill="#D51928"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 3.5 KiB

15
ElementX/Resources/Assets.xcassets/images/join-room-background.imageset/Contents.json vendored
View File

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

9
ElementX/Resources/Assets.xcassets/images/join-room-background.imageset/join-room-background.svg vendored
View File

@ -1,9 +0,0 @@
<svg width="387" height="508" viewBox="0 0 387 508" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M389.733 0.0917094C286.963 -0.463031 188.22 32.824 115.226 92.6301C42.2316 152.436 0.965681 233.862 0.506133 318.995C0.0465862 404.129 40.431 485.995 112.775 546.586C185.12 607.177 283.498 641.528 386.268 642.082L388 321.087L389.733 0.0917094Z" fill="url(#paint0_radial_570_35739)" fill-opacity="0.12"/>
<defs>
<radialGradient id="paint0_radial_570_35739" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(388.002 321.087) rotate(-89.6907) scale(320.689 387.125)">
<stop stop-color="#0DBD8B"/>
<stop offset="1" stop-color="#1273EB" stop-opacity="0"/>
</radialGradient>
</defs>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 723 B

12
ElementX/Resources/Assets.xcassets/images/waiting-gradient.imageset/Contents.json vendored
View File

@ -1,12 +0,0 @@
{
"images" : [
{
"filename" : "medium-light-dark.png",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
ElementX/Resources/Assets.xcassets/images/waiting-gradient.imageset/medium-light-dark.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 110 KiB

5
ElementX/Sources/Generated/Assets.swift
View File

@ -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

15
ElementX/Sources/Other/SwiftUI/Layout/FullscreenDialog.swift
View File

@ -148,15 +148,11 @@ struct FullscreenDialog<Content: View, BottomContent: View>: 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 {

2
ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/MessageComposer.swift
View File

@ -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)

BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_fullscreenDialog-iPad-en-GB.Bloom.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_fullscreenDialog-iPad-pseudo.Bloom.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_fullscreenDialog-iPhone-16-en-GB.Bloom.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_fullscreenDialog-iPhone-16-pseudo.Bloom.png (Stored with Git LFS)
View File

Binary file not shown.