From 3ccd8aab6a34fdc30c8fa2b5118d6b6303d944ae Mon Sep 17 00:00:00 2001 From: Doug Date: Sat, 24 Jun 2023 20:11:55 +0100 Subject: [PATCH] Fix asset folder structure. --- .../{Colors => colors}/Contents.json | 0 .../accent-color.colorset/Contents.json | 0 .../background-color.colorset/Contents.json | 0 .../{Images => images}/Contents.json | 0 .../app-logo.imageset/AppLogo.svg | 0 .../app-logo.imageset/Contents.json | 0 .../authentication}/Contents.json | 0 .../server-selection-icon.imageset/Contents.json | 0 .../authentication_server_selection_icon.svg | 0 .../close-circle.imageset/Contents.json | 0 .../url_preview_close_dark.pdf | 0 .../Encryption => images/encryption}/Contents.json | 0 .../encryption-normal.imageset/Contents.json | 0 .../encryption_normal.svg | 0 .../encryption-trusted.imageset/Contents.json | 0 .../encryption_trusted.svg | 0 .../encryption-warning.imageset/Contents.json | 0 .../encryption_warning.svg | 0 .../launch-background.imageset/Contents.json | 0 .../LaunchBackgroundPhone-squashed.png | Bin .../LaunchBackgroundTablet-squashed.png | Bin .../launch-logo.imageset/Contents.json | 0 .../launch-logo.imageset/LaunchLogo-dark.pdf | 0 .../launch-logo.imageset/LaunchLogo.pdf | 0 .../location-pin.imageset/Contents.json | 0 .../location-pin.imageset/location-pin-dark.pdf | 0 .../location-pin.imageset/location-pin.pdf | 0 .../Contents.json | 0 .../send.svg | 0 ElementX/Sources/Generated/Assets.swift | 6 +++--- 30 files changed, 3 insertions(+), 3 deletions(-) rename ElementX/Resources/Assets.xcassets/{Colors => colors}/Contents.json (100%) rename ElementX/Resources/Assets.xcassets/{Colors => colors}/accent-color.colorset/Contents.json (100%) rename ElementX/Resources/Assets.xcassets/{Colors => colors}/background-color.colorset/Contents.json (100%) rename ElementX/Resources/Assets.xcassets/{Images => images}/Contents.json (100%) rename ElementX/Resources/Assets.xcassets/{Images => images}/app-logo.imageset/AppLogo.svg (100%) rename ElementX/Resources/Assets.xcassets/{Images => images}/app-logo.imageset/Contents.json (100%) rename ElementX/Resources/Assets.xcassets/{Images/Authentication => images/authentication}/Contents.json (100%) rename ElementX/Resources/Assets.xcassets/{Images/Authentication => images/authentication}/server-selection-icon.imageset/Contents.json (100%) rename ElementX/Resources/Assets.xcassets/{Images/Authentication => images/authentication}/server-selection-icon.imageset/authentication_server_selection_icon.svg (100%) rename ElementX/Resources/Assets.xcassets/{Images => images}/close-circle.imageset/Contents.json (100%) rename ElementX/Resources/Assets.xcassets/{Images => images}/close-circle.imageset/url_preview_close_dark.pdf (100%) rename ElementX/Resources/Assets.xcassets/{Images/Encryption => images/encryption}/Contents.json (100%) rename ElementX/Resources/Assets.xcassets/{Images/Encryption => images/encryption}/encryption-normal.imageset/Contents.json (100%) rename ElementX/Resources/Assets.xcassets/{Images/Encryption => images/encryption}/encryption-normal.imageset/encryption_normal.svg (100%) rename ElementX/Resources/Assets.xcassets/{Images/Encryption => images/encryption}/encryption-trusted.imageset/Contents.json (100%) rename ElementX/Resources/Assets.xcassets/{Images/Encryption => images/encryption}/encryption-trusted.imageset/encryption_trusted.svg (100%) rename ElementX/Resources/Assets.xcassets/{Images/Encryption => images/encryption}/encryption-warning.imageset/Contents.json (100%) rename ElementX/Resources/Assets.xcassets/{Images/Encryption => images/encryption}/encryption-warning.imageset/encryption_warning.svg (100%) rename ElementX/Resources/Assets.xcassets/{Images => images}/launch-background.imageset/Contents.json (100%) rename ElementX/Resources/Assets.xcassets/{Images => images}/launch-background.imageset/LaunchBackgroundPhone-squashed.png (100%) rename ElementX/Resources/Assets.xcassets/{Images => images}/launch-background.imageset/LaunchBackgroundTablet-squashed.png (100%) rename ElementX/Resources/Assets.xcassets/{Images => images}/launch-logo.imageset/Contents.json (100%) rename ElementX/Resources/Assets.xcassets/{Images => images}/launch-logo.imageset/LaunchLogo-dark.pdf (100%) rename ElementX/Resources/Assets.xcassets/{Images => images}/launch-logo.imageset/LaunchLogo.pdf (100%) rename ElementX/Resources/Assets.xcassets/{Images => images}/location-pin.imageset/Contents.json (100%) rename ElementX/Resources/Assets.xcassets/{Images => images}/location-pin.imageset/location-pin-dark.pdf (100%) rename ElementX/Resources/Assets.xcassets/{Images => images}/location-pin.imageset/location-pin.pdf (100%) rename ElementX/Resources/Assets.xcassets/{Images => images}/timeline-composer-send-message.imageset/Contents.json (100%) rename ElementX/Resources/Assets.xcassets/{Images => images}/timeline-composer-send-message.imageset/send.svg (100%) diff --git a/ElementX/Resources/Assets.xcassets/Colors/Contents.json b/ElementX/Resources/Assets.xcassets/colors/Contents.json similarity index 100% rename from ElementX/Resources/Assets.xcassets/Colors/Contents.json rename to ElementX/Resources/Assets.xcassets/colors/Contents.json diff --git a/ElementX/Resources/Assets.xcassets/Colors/accent-color.colorset/Contents.json b/ElementX/Resources/Assets.xcassets/colors/accent-color.colorset/Contents.json similarity index 100% rename from ElementX/Resources/Assets.xcassets/Colors/accent-color.colorset/Contents.json rename to ElementX/Resources/Assets.xcassets/colors/accent-color.colorset/Contents.json diff --git a/ElementX/Resources/Assets.xcassets/Colors/background-color.colorset/Contents.json b/ElementX/Resources/Assets.xcassets/colors/background-color.colorset/Contents.json similarity index 100% rename from ElementX/Resources/Assets.xcassets/Colors/background-color.colorset/Contents.json rename to ElementX/Resources/Assets.xcassets/colors/background-color.colorset/Contents.json diff --git a/ElementX/Resources/Assets.xcassets/Images/Contents.json b/ElementX/Resources/Assets.xcassets/images/Contents.json similarity index 100% rename from ElementX/Resources/Assets.xcassets/Images/Contents.json rename to ElementX/Resources/Assets.xcassets/images/Contents.json diff --git a/ElementX/Resources/Assets.xcassets/Images/app-logo.imageset/AppLogo.svg b/ElementX/Resources/Assets.xcassets/images/app-logo.imageset/AppLogo.svg similarity index 100% rename from ElementX/Resources/Assets.xcassets/Images/app-logo.imageset/AppLogo.svg rename to ElementX/Resources/Assets.xcassets/images/app-logo.imageset/AppLogo.svg diff --git a/ElementX/Resources/Assets.xcassets/Images/app-logo.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/app-logo.imageset/Contents.json similarity index 100% rename from ElementX/Resources/Assets.xcassets/Images/app-logo.imageset/Contents.json rename to ElementX/Resources/Assets.xcassets/images/app-logo.imageset/Contents.json diff --git a/ElementX/Resources/Assets.xcassets/Images/Authentication/Contents.json b/ElementX/Resources/Assets.xcassets/images/authentication/Contents.json similarity index 100% rename from ElementX/Resources/Assets.xcassets/Images/Authentication/Contents.json rename to ElementX/Resources/Assets.xcassets/images/authentication/Contents.json diff --git a/ElementX/Resources/Assets.xcassets/Images/Authentication/server-selection-icon.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/authentication/server-selection-icon.imageset/Contents.json similarity index 100% rename from ElementX/Resources/Assets.xcassets/Images/Authentication/server-selection-icon.imageset/Contents.json rename to ElementX/Resources/Assets.xcassets/images/authentication/server-selection-icon.imageset/Contents.json diff --git a/ElementX/Resources/Assets.xcassets/Images/Authentication/server-selection-icon.imageset/authentication_server_selection_icon.svg b/ElementX/Resources/Assets.xcassets/images/authentication/server-selection-icon.imageset/authentication_server_selection_icon.svg similarity index 100% rename from ElementX/Resources/Assets.xcassets/Images/Authentication/server-selection-icon.imageset/authentication_server_selection_icon.svg rename to ElementX/Resources/Assets.xcassets/images/authentication/server-selection-icon.imageset/authentication_server_selection_icon.svg diff --git a/ElementX/Resources/Assets.xcassets/Images/close-circle.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/close-circle.imageset/Contents.json similarity index 100% rename from ElementX/Resources/Assets.xcassets/Images/close-circle.imageset/Contents.json rename to ElementX/Resources/Assets.xcassets/images/close-circle.imageset/Contents.json diff --git a/ElementX/Resources/Assets.xcassets/Images/close-circle.imageset/url_preview_close_dark.pdf b/ElementX/Resources/Assets.xcassets/images/close-circle.imageset/url_preview_close_dark.pdf similarity index 100% rename from ElementX/Resources/Assets.xcassets/Images/close-circle.imageset/url_preview_close_dark.pdf rename to ElementX/Resources/Assets.xcassets/images/close-circle.imageset/url_preview_close_dark.pdf diff --git a/ElementX/Resources/Assets.xcassets/Images/Encryption/Contents.json b/ElementX/Resources/Assets.xcassets/images/encryption/Contents.json similarity index 100% rename from ElementX/Resources/Assets.xcassets/Images/Encryption/Contents.json rename to ElementX/Resources/Assets.xcassets/images/encryption/Contents.json diff --git a/ElementX/Resources/Assets.xcassets/Images/Encryption/encryption-normal.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/encryption/encryption-normal.imageset/Contents.json similarity index 100% rename from ElementX/Resources/Assets.xcassets/Images/Encryption/encryption-normal.imageset/Contents.json rename to ElementX/Resources/Assets.xcassets/images/encryption/encryption-normal.imageset/Contents.json diff --git a/ElementX/Resources/Assets.xcassets/Images/Encryption/encryption-normal.imageset/encryption_normal.svg b/ElementX/Resources/Assets.xcassets/images/encryption/encryption-normal.imageset/encryption_normal.svg similarity index 100% rename from ElementX/Resources/Assets.xcassets/Images/Encryption/encryption-normal.imageset/encryption_normal.svg rename to ElementX/Resources/Assets.xcassets/images/encryption/encryption-normal.imageset/encryption_normal.svg diff --git a/ElementX/Resources/Assets.xcassets/Images/Encryption/encryption-trusted.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/encryption/encryption-trusted.imageset/Contents.json similarity index 100% rename from ElementX/Resources/Assets.xcassets/Images/Encryption/encryption-trusted.imageset/Contents.json rename to ElementX/Resources/Assets.xcassets/images/encryption/encryption-trusted.imageset/Contents.json diff --git a/ElementX/Resources/Assets.xcassets/Images/Encryption/encryption-trusted.imageset/encryption_trusted.svg b/ElementX/Resources/Assets.xcassets/images/encryption/encryption-trusted.imageset/encryption_trusted.svg similarity index 100% rename from ElementX/Resources/Assets.xcassets/Images/Encryption/encryption-trusted.imageset/encryption_trusted.svg rename to ElementX/Resources/Assets.xcassets/images/encryption/encryption-trusted.imageset/encryption_trusted.svg diff --git a/ElementX/Resources/Assets.xcassets/Images/Encryption/encryption-warning.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/encryption/encryption-warning.imageset/Contents.json similarity index 100% rename from ElementX/Resources/Assets.xcassets/Images/Encryption/encryption-warning.imageset/Contents.json rename to ElementX/Resources/Assets.xcassets/images/encryption/encryption-warning.imageset/Contents.json diff --git a/ElementX/Resources/Assets.xcassets/Images/Encryption/encryption-warning.imageset/encryption_warning.svg b/ElementX/Resources/Assets.xcassets/images/encryption/encryption-warning.imageset/encryption_warning.svg similarity index 100% rename from ElementX/Resources/Assets.xcassets/Images/Encryption/encryption-warning.imageset/encryption_warning.svg rename to ElementX/Resources/Assets.xcassets/images/encryption/encryption-warning.imageset/encryption_warning.svg diff --git a/ElementX/Resources/Assets.xcassets/Images/launch-background.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/launch-background.imageset/Contents.json similarity index 100% rename from ElementX/Resources/Assets.xcassets/Images/launch-background.imageset/Contents.json rename to ElementX/Resources/Assets.xcassets/images/launch-background.imageset/Contents.json diff --git a/ElementX/Resources/Assets.xcassets/Images/launch-background.imageset/LaunchBackgroundPhone-squashed.png b/ElementX/Resources/Assets.xcassets/images/launch-background.imageset/LaunchBackgroundPhone-squashed.png similarity index 100% rename from ElementX/Resources/Assets.xcassets/Images/launch-background.imageset/LaunchBackgroundPhone-squashed.png rename to ElementX/Resources/Assets.xcassets/images/launch-background.imageset/LaunchBackgroundPhone-squashed.png diff --git a/ElementX/Resources/Assets.xcassets/Images/launch-background.imageset/LaunchBackgroundTablet-squashed.png b/ElementX/Resources/Assets.xcassets/images/launch-background.imageset/LaunchBackgroundTablet-squashed.png similarity index 100% rename from ElementX/Resources/Assets.xcassets/Images/launch-background.imageset/LaunchBackgroundTablet-squashed.png rename to ElementX/Resources/Assets.xcassets/images/launch-background.imageset/LaunchBackgroundTablet-squashed.png diff --git a/ElementX/Resources/Assets.xcassets/Images/launch-logo.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/launch-logo.imageset/Contents.json similarity index 100% rename from ElementX/Resources/Assets.xcassets/Images/launch-logo.imageset/Contents.json rename to ElementX/Resources/Assets.xcassets/images/launch-logo.imageset/Contents.json diff --git a/ElementX/Resources/Assets.xcassets/Images/launch-logo.imageset/LaunchLogo-dark.pdf b/ElementX/Resources/Assets.xcassets/images/launch-logo.imageset/LaunchLogo-dark.pdf similarity index 100% rename from ElementX/Resources/Assets.xcassets/Images/launch-logo.imageset/LaunchLogo-dark.pdf rename to ElementX/Resources/Assets.xcassets/images/launch-logo.imageset/LaunchLogo-dark.pdf diff --git a/ElementX/Resources/Assets.xcassets/Images/launch-logo.imageset/LaunchLogo.pdf b/ElementX/Resources/Assets.xcassets/images/launch-logo.imageset/LaunchLogo.pdf similarity index 100% rename from ElementX/Resources/Assets.xcassets/Images/launch-logo.imageset/LaunchLogo.pdf rename to ElementX/Resources/Assets.xcassets/images/launch-logo.imageset/LaunchLogo.pdf diff --git a/ElementX/Resources/Assets.xcassets/Images/location-pin.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/location-pin.imageset/Contents.json similarity index 100% rename from ElementX/Resources/Assets.xcassets/Images/location-pin.imageset/Contents.json rename to ElementX/Resources/Assets.xcassets/images/location-pin.imageset/Contents.json diff --git a/ElementX/Resources/Assets.xcassets/Images/location-pin.imageset/location-pin-dark.pdf b/ElementX/Resources/Assets.xcassets/images/location-pin.imageset/location-pin-dark.pdf similarity index 100% rename from ElementX/Resources/Assets.xcassets/Images/location-pin.imageset/location-pin-dark.pdf rename to ElementX/Resources/Assets.xcassets/images/location-pin.imageset/location-pin-dark.pdf diff --git a/ElementX/Resources/Assets.xcassets/Images/location-pin.imageset/location-pin.pdf b/ElementX/Resources/Assets.xcassets/images/location-pin.imageset/location-pin.pdf similarity index 100% rename from ElementX/Resources/Assets.xcassets/Images/location-pin.imageset/location-pin.pdf rename to ElementX/Resources/Assets.xcassets/images/location-pin.imageset/location-pin.pdf diff --git a/ElementX/Resources/Assets.xcassets/Images/timeline-composer-send-message.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/timeline-composer-send-message.imageset/Contents.json similarity index 100% rename from ElementX/Resources/Assets.xcassets/Images/timeline-composer-send-message.imageset/Contents.json rename to ElementX/Resources/Assets.xcassets/images/timeline-composer-send-message.imageset/Contents.json diff --git a/ElementX/Resources/Assets.xcassets/Images/timeline-composer-send-message.imageset/send.svg b/ElementX/Resources/Assets.xcassets/images/timeline-composer-send-message.imageset/send.svg similarity index 100% rename from ElementX/Resources/Assets.xcassets/Images/timeline-composer-send-message.imageset/send.svg rename to ElementX/Resources/Assets.xcassets/images/timeline-composer-send-message.imageset/send.svg diff --git a/ElementX/Sources/Generated/Assets.swift b/ElementX/Sources/Generated/Assets.swift index 5b9b6d0c5..8b530d591 100644 --- a/ElementX/Sources/Generated/Assets.swift +++ b/ElementX/Sources/Generated/Assets.swift @@ -29,12 +29,12 @@ internal enum Asset { internal static let backgroundColor = ColorAsset(name: "colors/background-color") } internal enum Images { - internal static let encryptionNormal = ImageAsset(name: "images/encryption-normal") - internal static let encryptionTrusted = ImageAsset(name: "images/encryption-trusted") - internal static let encryptionWarning = ImageAsset(name: "images/encryption-warning") internal static let appLogo = ImageAsset(name: "images/app-logo") internal static let serverSelectionIcon = ImageAsset(name: "images/server-selection-icon") internal static let closeCircle = ImageAsset(name: "images/close-circle") + internal static let encryptionNormal = ImageAsset(name: "images/encryption-normal") + internal static let encryptionTrusted = ImageAsset(name: "images/encryption-trusted") + internal static let encryptionWarning = ImageAsset(name: "images/encryption-warning") internal static let launchBackground = ImageAsset(name: "images/launch-background") internal static let launchLogo = ImageAsset(name: "images/launch-logo") internal static let locationPin = ImageAsset(name: "images/location-pin")