diff --git a/Riot/Assets/Images.xcassets/Common/logo.imageset/Contents.json b/Riot/Assets/Images.xcassets/Common/logo.imageset/Contents.json deleted file mode 100644 index ffbc6e03b..000000000 --- a/Riot/Assets/Images.xcassets/Common/logo.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "logo.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "logo@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "logo@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/Images.xcassets/Common/logo.imageset/logo.png b/Riot/Assets/Images.xcassets/Common/logo.imageset/logo.png deleted file mode 100644 index eea53f0e7..000000000 Binary files a/Riot/Assets/Images.xcassets/Common/logo.imageset/logo.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Common/logo.imageset/logo@2x.png b/Riot/Assets/Images.xcassets/Common/logo.imageset/logo@2x.png deleted file mode 100644 index 64378a435..000000000 Binary files a/Riot/Assets/Images.xcassets/Common/logo.imageset/logo@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Common/logo.imageset/logo@3x.png b/Riot/Assets/Images.xcassets/Common/logo.imageset/logo@3x.png deleted file mode 100644 index 2907add84..000000000 Binary files a/Riot/Assets/Images.xcassets/Common/logo.imageset/logo@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/LaunchScreenRiot.imageset/Contents.json b/Riot/Assets/Images.xcassets/LaunchScreenRiot.imageset/Contents.json deleted file mode 100644 index 90949704d..000000000 --- a/Riot/Assets/Images.xcassets/LaunchScreenRiot.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "LaunchScreenRiot.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/Images.xcassets/LaunchScreenRiot.imageset/LaunchScreenRiot.png b/Riot/Assets/Images.xcassets/LaunchScreenRiot.imageset/LaunchScreenRiot.png deleted file mode 100644 index e8d821507..000000000 Binary files a/Riot/Assets/Images.xcassets/LaunchScreenRiot.imageset/LaunchScreenRiot.png and /dev/null differ diff --git a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/Contents.json b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/Contents.json deleted file mode 100644 index da4a164c9..000000000 --- a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-0.imageset/Contents.json b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-0.imageset/Contents.json deleted file mode 100644 index 03409e8e8..000000000 --- a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-0.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "animatedLogo-0.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-0.imageset/animatedLogo-0.png b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-0.imageset/animatedLogo-0.png deleted file mode 100644 index e8d821507..000000000 Binary files a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-0.imageset/animatedLogo-0.png and /dev/null differ diff --git a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-1.imageset/Contents.json b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-1.imageset/Contents.json deleted file mode 100644 index ff9dd52fd..000000000 --- a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-1.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "animatedLogo-1.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-1.imageset/animatedLogo-1.png b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-1.imageset/animatedLogo-1.png deleted file mode 100644 index 6c6f15c9c..000000000 Binary files a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-1.imageset/animatedLogo-1.png and /dev/null differ diff --git a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-2.imageset/Contents.json b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-2.imageset/Contents.json deleted file mode 100644 index 74dd17810..000000000 --- a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-2.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "animatedLogo-2.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-2.imageset/animatedLogo-2.png b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-2.imageset/animatedLogo-2.png deleted file mode 100644 index 714008e4c..000000000 Binary files a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-2.imageset/animatedLogo-2.png and /dev/null differ diff --git a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-3.imageset/Contents.json b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-3.imageset/Contents.json deleted file mode 100644 index 17c939fab..000000000 --- a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-3.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "animatedLogo-3.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-3.imageset/animatedLogo-3.png b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-3.imageset/animatedLogo-3.png deleted file mode 100644 index f5e02a9bb..000000000 Binary files a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-3.imageset/animatedLogo-3.png and /dev/null differ diff --git a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-4.imageset/Contents.json b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-4.imageset/Contents.json deleted file mode 100644 index 50bc23e82..000000000 --- a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-4.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "animatedLogo-4.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-4.imageset/animatedLogo-4.png b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-4.imageset/animatedLogo-4.png deleted file mode 100644 index dfe41a330..000000000 Binary files a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-4.imageset/animatedLogo-4.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Common/horizontal_logo.imageset/Contents.json b/Riot/Assets/SharedImages.xcassets/horizontal_logo.imageset/Contents.json similarity index 100% rename from Riot/Assets/Images.xcassets/Common/horizontal_logo.imageset/Contents.json rename to Riot/Assets/SharedImages.xcassets/horizontal_logo.imageset/Contents.json diff --git a/Riot/Assets/Images.xcassets/Common/horizontal_logo.imageset/horizontal_logo.png b/Riot/Assets/SharedImages.xcassets/horizontal_logo.imageset/horizontal_logo.png similarity index 100% rename from Riot/Assets/Images.xcassets/Common/horizontal_logo.imageset/horizontal_logo.png rename to Riot/Assets/SharedImages.xcassets/horizontal_logo.imageset/horizontal_logo.png diff --git a/Riot/Assets/Images.xcassets/Common/horizontal_logo.imageset/horizontal_logo@2x.png b/Riot/Assets/SharedImages.xcassets/horizontal_logo.imageset/horizontal_logo@2x.png similarity index 100% rename from Riot/Assets/Images.xcassets/Common/horizontal_logo.imageset/horizontal_logo@2x.png rename to Riot/Assets/SharedImages.xcassets/horizontal_logo.imageset/horizontal_logo@2x.png diff --git a/Riot/Assets/Images.xcassets/Common/horizontal_logo.imageset/horizontal_logo@3x.png b/Riot/Assets/SharedImages.xcassets/horizontal_logo.imageset/horizontal_logo@3x.png similarity index 100% rename from Riot/Assets/Images.xcassets/Common/horizontal_logo.imageset/horizontal_logo@3x.png rename to Riot/Assets/SharedImages.xcassets/horizontal_logo.imageset/horizontal_logo@3x.png diff --git a/Riot/Generated/Images.swift b/Riot/Generated/Images.swift index 05ebc1612..0d9dd588d 100644 --- a/Riot/Generated/Images.swift +++ b/Riot/Generated/Images.swift @@ -36,8 +36,6 @@ internal enum Asset { internal static let closeButton = ImageAsset(name: "close_button") internal static let disclosureIcon = ImageAsset(name: "disclosure_icon") internal static let group = ImageAsset(name: "group") - internal static let horizontalLogo = ImageAsset(name: "horizontal_logo") - internal static let logo = ImageAsset(name: "logo") internal static let monitor = ImageAsset(name: "monitor") internal static let placeholder = ImageAsset(name: "placeholder") internal static let plusIcon = ImageAsset(name: "plus_icon") @@ -69,7 +67,6 @@ internal enum Asset { internal static let keyBackupLogo = ImageAsset(name: "key_backup_logo") internal static let revealPasswordButton = ImageAsset(name: "reveal_password_button") internal static let keyVerificationSuccessShield = ImageAsset(name: "key_verification_success_shield") - internal static let launchScreenRiot = ImageAsset(name: "LaunchScreenRiot") internal static let cameraCapture = ImageAsset(name: "camera_capture") internal static let cameraPlay = ImageAsset(name: "camera_play") internal static let cameraStop = ImageAsset(name: "camera_stop") @@ -116,13 +113,9 @@ internal enum Asset { internal static let launchScreenLogo = ImageAsset(name: "launch_screen_logo") } internal enum SharedImages { - internal static let animatedLogo0 = ImageAsset(name: "animatedLogo-0") - internal static let animatedLogo1 = ImageAsset(name: "animatedLogo-1") - internal static let animatedLogo2 = ImageAsset(name: "animatedLogo-2") - internal static let animatedLogo3 = ImageAsset(name: "animatedLogo-3") - internal static let animatedLogo4 = ImageAsset(name: "animatedLogo-4") internal static let cancel = ImageAsset(name: "cancel") internal static let e2eVerified = ImageAsset(name: "e2e_verified") + internal static let horizontalLogo = ImageAsset(name: "horizontal_logo") } } // swiftlint:enable identifier_name line_length nesting type_body_length type_name