diff --git a/AuthenticatorShared/UI/Platform/Application/Appearance/Styles/AccessoryButtonStyle.swift b/AuthenticatorShared/UI/Platform/Application/Appearance/Styles/AccessoryButtonStyle.swift index 6d79961ff1..0460ee26b7 100644 --- a/AuthenticatorShared/UI/Platform/Application/Appearance/Styles/AccessoryButtonStyle.swift +++ b/AuthenticatorShared/UI/Platform/Application/Appearance/Styles/AccessoryButtonStyle.swift @@ -1,3 +1,4 @@ +import BitwardenResources import SwiftUI // MARK: - AccessoryButtonStyle @@ -31,14 +32,14 @@ extension ButtonStyle where Self == AccessoryButtonStyle { #if DEBUG #Preview("Enabled") { Button {} label: { - Asset.Images.bwiProvider.swiftUIImage + SharedAsset.Icons.copy24.swiftUIImage } .buttonStyle(.accessory) } #Preview("Disabled") { Button {} label: { - Asset.Images.bwiProvider.swiftUIImage + SharedAsset.Icons.copy24.swiftUIImage } .buttonStyle(.accessory) .disabled(true) diff --git a/AuthenticatorShared/UI/Platform/Application/Appearance/UI.swift b/AuthenticatorShared/UI/Platform/Application/Appearance/UI.swift index 70c66a7074..dd71eb9e3f 100644 --- a/AuthenticatorShared/UI/Platform/Application/Appearance/UI.swift +++ b/AuthenticatorShared/UI/Platform/Application/Appearance/UI.swift @@ -76,10 +76,10 @@ public enum UI { UISearchBar.appearance().tintColor = Asset.Colors.primaryBitwarden.color // Explicitly tint the image so that it does not assume the tint color assigned to the entire search bar. - let image = Asset.Images.cancelRound.image + let image = SharedAsset.Icons.circleX16.image let tintedImage = image.withTintColor(Asset.Colors.textSecondary.color, renderingMode: .alwaysOriginal) UISearchBar.appearance().setImage(tintedImage, for: .clear, state: .normal) - UISearchBar.appearance().setImage(Asset.Images.magnifyingGlass.image, for: .search, state: .normal) + UISearchBar.appearance().setImage(SharedAsset.Icons.search16.image, for: .search, state: .normal) // Adjust the appearance of `UITextView` for `BitwardenMultilineTextField` instances on // iOS 15. diff --git a/AuthenticatorShared/UI/Platform/Application/Extensions/View+Toolbar.swift b/AuthenticatorShared/UI/Platform/Application/Extensions/View+Toolbar.swift index 7c7ac5df34..b7eddf5081 100644 --- a/AuthenticatorShared/UI/Platform/Application/Extensions/View+Toolbar.swift +++ b/AuthenticatorShared/UI/Platform/Application/Extensions/View+Toolbar.swift @@ -15,7 +15,7 @@ extension View { /// - Returns: A `Button` configured for adding an item. /// func addToolbarButton(hidden: Bool = false, action: @escaping () -> Void) -> some View { - toolbarButton(asset: Asset.Images.plus, label: Localizations.add, action: action) + toolbarButton(asset: SharedAsset.Icons.plus16, label: Localizations.add, action: action) .hidden(hidden) .accessibilityIdentifier("AddItemButton") } @@ -26,7 +26,7 @@ extension View { /// - Returns: A `Button` configured for cancelling an operation in a view. /// func cancelToolbarButton(action: @escaping () -> Void) -> some View { - toolbarButton(asset: Asset.Images.cancel, label: Localizations.cancel, action: action) + toolbarButton(asset: SharedAsset.Icons.close16, label: Localizations.cancel, action: action) .accessibilityIdentifier("CancelButton") } @@ -36,7 +36,7 @@ extension View { /// - Returns: A `Button` configured for closing a view. /// func closeToolbarButton(action: @escaping () -> Void) -> some View { - toolbarButton(asset: Asset.Images.cancel, label: Localizations.close, action: action) + toolbarButton(asset: SharedAsset.Icons.close16, label: Localizations.close, action: action) .accessibilityIdentifier("CloseButton") } @@ -58,7 +58,7 @@ extension View { /// - action: The action to perform when the button is tapped. /// - Returns: A `Button` for displaying an image in a toolbar. /// - func toolbarButton(asset: ImageAsset, label: String, action: @escaping () -> Void) -> some View { + func toolbarButton(asset: SharedImageAsset, label: String, action: @escaping () -> Void) -> some View { Button(action: action) { Image(asset: asset, label: Text(label)) .imageStyle(.toolbarIcon) @@ -96,7 +96,7 @@ extension View { Menu { content() } label: { - Image(asset: Asset.Images.verticalKabob, label: Text(Localizations.options)) + Image(asset: SharedAsset.Icons.ellipsisVertical24, label: Text(Localizations.options)) .imageStyle(.toolbarIcon) .accessibilityIdentifier("HeaderBarOptionsButton") } diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/bw-logo.imageset/Contents.json b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/bw-logo.imageset/Contents.json deleted file mode 100644 index 28f9f812b4..0000000000 --- a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/bw-logo.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "bw-logo.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/bw-logo.imageset/bw-logo.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/bw-logo.imageset/bw-logo.pdf deleted file mode 100644 index f13a303fff..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/bw-logo.imageset/bw-logo.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/bwi-provider.imageset/Contents.json b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/bwi-provider.imageset/Contents.json deleted file mode 100644 index c48aeab1d9..0000000000 --- a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/bwi-provider.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "bwi-provider.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/bwi-provider.imageset/bwi-provider.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/bwi-provider.imageset/bwi-provider.pdf deleted file mode 100644 index a60dcdc50c..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/bwi-provider.imageset/bwi-provider.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/camera.imageset/camera.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/camera.imageset/camera.pdf deleted file mode 100644 index e7b0f35e5a..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/camera.imageset/camera.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/cancel-round.imageset/Contents.json b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/cancel-round.imageset/Contents.json deleted file mode 100644 index 72f89a3c31..0000000000 --- a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/cancel-round.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "cancel-round.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/cancel-round.imageset/cancel-round.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/cancel-round.imageset/cancel-round.pdf deleted file mode 100644 index c7dc733bbd..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/cancel-round.imageset/cancel-round.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/cancel.imageset/Contents.json b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/cancel.imageset/Contents.json deleted file mode 100644 index 480b3ffd9b..0000000000 --- a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/cancel.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "cancel.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/cancel.imageset/cancel.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/cancel.imageset/cancel.pdf deleted file mode 100644 index 83df2736d0..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/cancel.imageset/cancel.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/check.imageset/check.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/check.imageset/check.pdf deleted file mode 100644 index d733f03711..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/check.imageset/check.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/chevron-down.imageset/Contents.json b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/chevron-down.imageset/Contents.json deleted file mode 100644 index ca0c9a2110..0000000000 --- a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/chevron-down.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "filename" : "chevron-down.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/chevron-down.imageset/chevron-down.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/chevron-down.imageset/chevron-down.pdf deleted file mode 100644 index 23de0cb2e0..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/chevron-down.imageset/chevron-down.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/clock.imageset/Contents.json b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/clock.imageset/Contents.json deleted file mode 100644 index 47a600cfdb..0000000000 --- a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/clock.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "clock.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/clock.imageset/clock.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/clock.imageset/clock.pdf deleted file mode 100644 index 1071dab22a..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/clock.imageset/clock.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/collections.imageset/Contents.json b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/collections.imageset/Contents.json deleted file mode 100644 index 1073576baf..0000000000 --- a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/collections.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "collections.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/collections.imageset/collections.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/collections.imageset/collections.pdf deleted file mode 100644 index 1dfed09326..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/collections.imageset/collections.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/copy.imageset/Contents.json b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/copy.imageset/Contents.json deleted file mode 100644 index 684583c8d3..0000000000 --- a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/copy.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "copy.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/copy.imageset/copy.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/copy.imageset/copy.pdf deleted file mode 100644 index 0c77323ee4..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/copy.imageset/copy.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/credit-card.imageset/Contents.json b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/credit-card.imageset/Contents.json deleted file mode 100644 index 64a9685940..0000000000 --- a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/credit-card.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "credit-card.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/credit-card.imageset/credit-card.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/credit-card.imageset/credit-card.pdf deleted file mode 100644 index 2a6141a553..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/credit-card.imageset/credit-card.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/doc.imageset/Contents.json b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/doc.imageset/Contents.json deleted file mode 100644 index c4dcd9f7c0..0000000000 --- a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/doc.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "doc.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/doc.imageset/doc.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/doc.imageset/doc.pdf deleted file mode 100644 index 55fff0d745..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/doc.imageset/doc.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/down-angle.imageset/Contents.json b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/down-angle.imageset/Contents.json deleted file mode 100644 index 0b6be7a934..0000000000 --- a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/down-angle.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "down-angle.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/down-angle.imageset/down-angle.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/down-angle.imageset/down-angle.pdf deleted file mode 100644 index e0d1237d67..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/down-angle.imageset/down-angle.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/external-link-2.imageset/Contents.json b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/external-link-2.imageset/Contents.json deleted file mode 100644 index 60bdd6abc7..0000000000 --- a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/external-link-2.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "external-link-2.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/external-link-2.imageset/external-link-2.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/external-link-2.imageset/external-link-2.pdf deleted file mode 100644 index ccfa6a283a..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/external-link-2.imageset/external-link-2.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/external-link.imageset/Contents.json b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/external-link.imageset/Contents.json deleted file mode 100644 index 60fd3a4153..0000000000 --- a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/external-link.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "external-link.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/external-link.imageset/external-link.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/external-link.imageset/external-link.pdf deleted file mode 100644 index ad13bfcc33..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/external-link.imageset/external-link.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/folder-closed.imageset/Contents.json b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/folder-closed.imageset/Contents.json deleted file mode 100644 index fe4497aa3e..0000000000 --- a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/folder-closed.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "folder-closed.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/folder-closed.imageset/folder-closed.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/folder-closed.imageset/folder-closed.pdf deleted file mode 100644 index 8394e9c9ed..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/folder-closed.imageset/folder-closed.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/gear-filled.imageset/gear-filled.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/gear-filled.imageset/gear-filled.pdf deleted file mode 100644 index 9481ee4756..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/gear-filled.imageset/gear-filled.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/gear.imageset/Contents.json b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/gear.imageset/Contents.json deleted file mode 100644 index 03a611147f..0000000000 --- a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/gear.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "gear.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/gear.imageset/gear.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/gear.imageset/gear.pdf deleted file mode 100644 index a61fc48252..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/gear.imageset/gear.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/globe.imageset/Contents.json b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/globe.imageset/Contents.json deleted file mode 100644 index 61a43136a6..0000000000 --- a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/globe.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "globe.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/globe.imageset/globe.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/globe.imageset/globe.pdf deleted file mode 100644 index 2107998077..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/globe.imageset/globe.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/hidden.imageset/Contents.json b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/hidden.imageset/Contents.json deleted file mode 100644 index 84aa2efcc2..0000000000 --- a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/hidden.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "hidden.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/hidden.imageset/hidden.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/hidden.imageset/hidden.pdf deleted file mode 100644 index af5152b9a5..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/hidden.imageset/hidden.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/horizontal-kabob.imageset/Contents.json b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/horizontal-kabob.imageset/Contents.json deleted file mode 100644 index fb6b4dbe59..0000000000 --- a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/horizontal-kabob.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "horizontal-kabob.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/horizontal-kabob.imageset/horizontal-kabob.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/horizontal-kabob.imageset/horizontal-kabob.pdf deleted file mode 100644 index 361aab993a..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/horizontal-kabob.imageset/horizontal-kabob.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/id.imageset/Contents.json b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/id.imageset/Contents.json deleted file mode 100644 index 31b9ff2927..0000000000 --- a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/id.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "id.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/id.imageset/id.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/id.imageset/id.pdf deleted file mode 100644 index bd1ea636ef..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/id.imageset/id.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/locked-filled.imageset/locked-filled.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/locked-filled.imageset/locked-filled.pdf deleted file mode 100644 index 629c28b6ca..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/locked-filled.imageset/locked-filled.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/magnifying-glass.imageset/Contents.json b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/magnifying-glass.imageset/Contents.json deleted file mode 100644 index 471701ec49..0000000000 --- a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/magnifying-glass.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "magnifying-glass.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/magnifying-glass.imageset/magnifying-glass.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/magnifying-glass.imageset/magnifying-glass.pdf deleted file mode 100644 index 3297dfc787..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/magnifying-glass.imageset/magnifying-glass.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/paperclip.imageset/paperclip.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/paperclip.imageset/paperclip.pdf deleted file mode 100644 index d6ed1a4cb2..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/paperclip.imageset/paperclip.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/pencil.imageset/Contents.json b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/pencil.imageset/Contents.json deleted file mode 100644 index 0fa969404c..0000000000 --- a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/pencil.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "pencil.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/pencil.imageset/pencil.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/pencil.imageset/pencil.pdf deleted file mode 100644 index d2bb1034de..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/pencil.imageset/pencil.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/plus.imageset/plus.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/plus.imageset/plus.pdf deleted file mode 100644 index f98ed9b933..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/plus.imageset/plus.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/right-angle.imageset/Contents.json b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/right-angle.imageset/Contents.json deleted file mode 100644 index 25e18bb3f1..0000000000 --- a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/right-angle.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "right-angle.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/right-angle.imageset/right-angle.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/right-angle.imageset/right-angle.pdf deleted file mode 100644 index b47df2870e..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/right-angle.imageset/right-angle.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/trash.imageset/Contents.json b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/trash.imageset/Contents.json deleted file mode 100644 index 009da9e02a..0000000000 --- a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/trash.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "trash.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/trash.imageset/trash.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/trash.imageset/trash.pdf deleted file mode 100644 index ca25c385e7..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/trash.imageset/trash.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/up-angle.imageset/Contents.json b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/up-angle.imageset/Contents.json deleted file mode 100644 index 088bf113cb..0000000000 --- a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/up-angle.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "up-angle.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/up-angle.imageset/up-angle.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/up-angle.imageset/up-angle.pdf deleted file mode 100644 index d093b05711..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/up-angle.imageset/up-angle.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/vertical-kabob.imageset/Contents.json b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/vertical-kabob.imageset/Contents.json deleted file mode 100644 index a0214e7582..0000000000 --- a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/vertical-kabob.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "vertical-kabob.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/vertical-kabob.imageset/vertical-kabob.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/vertical-kabob.imageset/vertical-kabob.pdf deleted file mode 100644 index c93764bcc6..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/vertical-kabob.imageset/vertical-kabob.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/visible.imageset/Contents.json b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/visible.imageset/Contents.json deleted file mode 100644 index 3b0adeeeb1..0000000000 --- a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/visible.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "visible.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/visible.imageset/visible.pdf b/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/visible.imageset/visible.pdf deleted file mode 100644 index 10e56c08be..0000000000 Binary files a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/visible.imageset/visible.pdf and /dev/null differ diff --git a/AuthenticatorShared/UI/Platform/Application/Views/AccessoryButton.swift b/AuthenticatorShared/UI/Platform/Application/Views/AccessoryButton.swift index f0139e5b06..b2227ebb5c 100644 --- a/AuthenticatorShared/UI/Platform/Application/Views/AccessoryButton.swift +++ b/AuthenticatorShared/UI/Platform/Application/Views/AccessoryButton.swift @@ -26,7 +26,7 @@ struct AccessoryButton: View { var action: Action /// The image to display in the button. - var asset: ImageAsset + var asset: SharedImageAsset var body: some View { switch action { @@ -59,7 +59,7 @@ struct AccessoryButton: View { /// - accessibilityLabel: The accessibility label of the button. /// - action: The action to perform when the user triggers the button. /// - init(asset: ImageAsset, accessibilityLabel: String, action: @escaping () -> Void) { + init(asset: SharedImageAsset, accessibilityLabel: String, action: @escaping () -> Void) { self.accessibilityLabel = accessibilityLabel self.action = .sync(action) self.asset = asset @@ -73,7 +73,7 @@ struct AccessoryButton: View { /// - accessibilityLabel: The accessibility label of the button. /// - action: The action to perform when the user triggers the button. /// - init(asset: ImageAsset, accessibilityLabel: String, action: @escaping () async -> Void) { + init(asset: SharedImageAsset, accessibilityLabel: String, action: @escaping () async -> Void) { self.accessibilityLabel = accessibilityLabel self.action = .async(action) self.asset = asset @@ -83,5 +83,5 @@ struct AccessoryButton: View { // MARK: Previews #Preview { - AccessoryButton(asset: Asset.Images.copy, accessibilityLabel: Localizations.copy) {} + AccessoryButton(asset: SharedAsset.Icons.copy16, accessibilityLabel: Localizations.copy) {} } diff --git a/AuthenticatorShared/UI/Platform/Application/Views/BitwardenMenuField.swift b/AuthenticatorShared/UI/Platform/Application/Views/BitwardenMenuField.swift index 6832fef72a..a2992fb757 100644 --- a/AuthenticatorShared/UI/Platform/Application/Views/BitwardenMenuField.swift +++ b/AuthenticatorShared/UI/Platform/Application/Views/BitwardenMenuField.swift @@ -176,7 +176,7 @@ private enum MenuPreviewOptions: CaseIterable, Menuable { selection: .constant(.dog) ) { Button {} label: { - Asset.Images.camera.swiftUIImage + SharedAsset.Icons.camera16.swiftUIImage } .buttonStyle(.accessory) } diff --git a/AuthenticatorShared/UI/Platform/Application/Views/BitwardenTextField.swift b/AuthenticatorShared/UI/Platform/Application/Views/BitwardenTextField.swift index d92c778050..9921190a43 100644 --- a/AuthenticatorShared/UI/Platform/Application/Views/BitwardenTextField.swift +++ b/AuthenticatorShared/UI/Platform/Application/Views/BitwardenTextField.swift @@ -59,8 +59,8 @@ struct BitwardenTextField: View { if let isPasswordVisible, canViewPassword { AccessoryButton( asset: isPasswordVisible.wrappedValue - ? Asset.Images.hidden - : Asset.Images.visible, + ? SharedAsset.Icons.eyeSlash24 + : SharedAsset.Icons.eye24, accessibilityLabel: isPasswordVisible.wrappedValue ? Localizations.passwordIsVisibleTapToHide : Localizations.passwordIsNotVisibleTapToShow @@ -110,7 +110,7 @@ struct BitwardenTextField: View { Button { text = "" } label: { - Asset.Images.cancelRound.swiftUIImage + SharedAsset.Icons.circleX16.swiftUIImage .foregroundColor(Asset.Colors.primaryBitwarden.swiftUIColor) .frame(width: 14, height: 14) } @@ -239,7 +239,7 @@ extension BitwardenTextField where TrailingContent == EmptyView { title: "Title", text: .constant("Text field text") ) { - AccessoryButton(asset: Asset.Images.gear, accessibilityLabel: "") {} + AccessoryButton(asset: SharedAsset.Icons.cog16, accessibilityLabel: "") {} } .padding() } @@ -254,7 +254,7 @@ extension BitwardenTextField where TrailingContent == EmptyView { footer: "Text field footer", isPasswordVisible: .constant(false) ) { - AccessoryButton(asset: Asset.Images.gear, accessibilityLabel: "") {} + AccessoryButton(asset: SharedAsset.Icons.cog16, accessibilityLabel: "") {} } .padding() } diff --git a/AuthenticatorShared/UI/Platform/Application/Views/ExpandableHeaderView.swift b/AuthenticatorShared/UI/Platform/Application/Views/ExpandableHeaderView.swift index ecb6909936..27e4ab94fe 100644 --- a/AuthenticatorShared/UI/Platform/Application/Views/ExpandableHeaderView.swift +++ b/AuthenticatorShared/UI/Platform/Application/Views/ExpandableHeaderView.swift @@ -50,7 +50,7 @@ struct ExpandableHeaderView: View { HStack(spacing: 8) { SectionHeaderView("\(title) (\(count))") - Asset.Images.chevronDown.swiftUIImage + SharedAsset.Icons.chevronDown16.swiftUIImage .imageStyle(.accessoryIcon(scaleWithFont: true)) .rotationEffect(isExpanded ? Angle(degrees: 180) : .zero) } diff --git a/AuthenticatorShared/UI/Platform/Application/Views/SearchNoResultsView.swift b/AuthenticatorShared/UI/Platform/Application/Views/SearchNoResultsView.swift index 9ba2962c4d..61d4ac1406 100644 --- a/AuthenticatorShared/UI/Platform/Application/Views/SearchNoResultsView.swift +++ b/AuthenticatorShared/UI/Platform/Application/Views/SearchNoResultsView.swift @@ -22,7 +22,7 @@ struct SearchNoResultsView: View { } VStack(spacing: 35) { - Image(decorative: Asset.Images.magnifyingGlass) + Image(decorative: SharedAsset.Icons.search24) .resizable() .frame(width: 74, height: 74) .foregroundColor(Asset.Colors.textSecondary.swiftUIColor) diff --git a/AuthenticatorShared/UI/Platform/Settings/Settings/SelectLanguage/SelectLanguageView.swift b/AuthenticatorShared/UI/Platform/Settings/Settings/SelectLanguage/SelectLanguageView.swift index a683e49ee8..b3c43321b6 100644 --- a/AuthenticatorShared/UI/Platform/Settings/Settings/SelectLanguage/SelectLanguageView.swift +++ b/AuthenticatorShared/UI/Platform/Settings/Settings/SelectLanguage/SelectLanguageView.swift @@ -36,7 +36,7 @@ struct SelectLanguageView: View { @ViewBuilder private func checkmarkView(_ languageOption: LanguageOption) -> some View { if languageOption == store.state.currentLanguage { - Image(asset: Asset.Images.check) + Image(asset: SharedAsset.Icons.check24) .imageStyle(.rowIcon) } } diff --git a/AuthenticatorShared/UI/Platform/Settings/Settings/SettingsListItem.swift b/AuthenticatorShared/UI/Platform/Settings/Settings/SettingsListItem.swift index 7ad9652eb2..1d14c10e8a 100644 --- a/AuthenticatorShared/UI/Platform/Settings/Settings/SettingsListItem.swift +++ b/AuthenticatorShared/UI/Platform/Settings/Settings/SettingsListItem.swift @@ -1,3 +1,4 @@ +import BitwardenResources import SwiftUI // MARK: - SettingsListItem @@ -101,7 +102,7 @@ struct SettingsListItem: View { } SettingsListItem("Account Security") {} trailingContent: { - Image(asset: Asset.Images.externalLink) + Image(asset: SharedAsset.Icons.externalLink16) } SettingsListItem("Account Security") {} diff --git a/AuthenticatorShared/UI/Platform/Settings/Settings/SettingsView.swift b/AuthenticatorShared/UI/Platform/Settings/Settings/SettingsView.swift index 87480f55f5..88a4e406ca 100644 --- a/AuthenticatorShared/UI/Platform/Settings/Settings/SettingsView.swift +++ b/AuthenticatorShared/UI/Platform/Settings/Settings/SettingsView.swift @@ -76,7 +76,7 @@ struct SettingsView: View { /// The chevron shown in the settings list item. private var chevron: some View { - Image(asset: Asset.Images.rightAngle) + Image(asset: SharedAsset.Icons.chevronRight16) .resizable() .scaledFrame(width: 12, height: 12) .foregroundColor(Color(asset: Asset.Colors.textSecondary)) @@ -164,7 +164,7 @@ struct SettingsView: View { SettingsListItem(store.state.version, hasDivider: false) { store.send(.versionTapped) } trailingContent: { - Asset.Images.copy.swiftUIImage + SharedAsset.Icons.copy16.swiftUIImage .imageStyle(.rowIcon) } } @@ -253,7 +253,7 @@ struct SettingsView: View { SettingsListItem(name, hasDivider: hasDivider) { store.send(action) } trailingContent: { - Asset.Images.externalLink2.swiftUIImage + SharedAsset.Icons.externalLink16.swiftUIImage .imageStyle(.rowIcon) } } @@ -282,7 +282,7 @@ struct SettingsView: View { .frame(maxWidth: .infinity, alignment: .leading) .multilineTextAlignment(.leading) - Asset.Images.externalLink2.swiftUIImage + SharedAsset.Icons.externalLink16.swiftUIImage .imageStyle(.rowIcon) } .padding(16) diff --git a/AuthenticatorShared/UI/Platform/Tabs/TabRoute.swift b/AuthenticatorShared/UI/Platform/Tabs/TabRoute.swift index bc84d4eb36..e4b668f099 100644 --- a/AuthenticatorShared/UI/Platform/Tabs/TabRoute.swift +++ b/AuthenticatorShared/UI/Platform/Tabs/TabRoute.swift @@ -25,8 +25,8 @@ public enum TabRoute: Equatable, Hashable { extension TabRoute: TabRepresentable { public var image: UIImage? { switch self { - case .itemList: return Asset.Images.recoveryCodes.image - case .settings: return Asset.Images.gearFilled.image + case .itemList: return SharedAsset.Icons.recoveryCodes.image + case .settings: return SharedAsset.Icons.gearFilled24.image } } @@ -39,8 +39,8 @@ extension TabRoute: TabRepresentable { public var selectedImage: UIImage? { switch self { - case .itemList: return Asset.Images.recoveryCodes.image - case .settings: return Asset.Images.gearFilled.image + case .itemList: return SharedAsset.Icons.recoveryCodes.image + case .settings: return SharedAsset.Icons.gearFilled24.image } } diff --git a/AuthenticatorShared/UI/Vault/AuthenticatorItem/EditAuthenticatorItem/EditAuthenticatorItemView.swift b/AuthenticatorShared/UI/Vault/AuthenticatorItem/EditAuthenticatorItem/EditAuthenticatorItemView.swift index d9fd6b1da1..4e59e115db 100644 --- a/AuthenticatorShared/UI/Vault/AuthenticatorItem/EditAuthenticatorItem/EditAuthenticatorItemView.swift +++ b/AuthenticatorShared/UI/Vault/AuthenticatorItem/EditAuthenticatorItem/EditAuthenticatorItemView.swift @@ -109,7 +109,7 @@ struct EditAuthenticatorItemView: View { Text(Localizations.advanced) .styleGuide(.body) - Asset.Images.downAngle.swiftUIImage + SharedAsset.Icons.chevronDown16.swiftUIImage .imageStyle(.accessoryIcon) .rotationEffect(store.state.isAdvancedExpanded ? Angle(degrees: 180) : .zero) } diff --git a/AuthenticatorShared/UI/Vault/ItemList/ItemList/ItemListCardView.swift b/AuthenticatorShared/UI/Vault/ItemList/ItemList/ItemListCardView.swift index e545e957f6..8d722cfdfb 100644 --- a/AuthenticatorShared/UI/Vault/ItemList/ItemList/ItemListCardView.swift +++ b/AuthenticatorShared/UI/Vault/ItemList/ItemList/ItemListCardView.swift @@ -55,7 +55,7 @@ struct ItemListCardView: View { Button { closeTapped() } label: { - Image(decorative: Asset.Images.cancel) + Image(decorative: SharedAsset.Icons.close16) .padding(16) // Add padding to increase tappable area... } .padding(-16) // ...but remove it to not affect layout. @@ -104,7 +104,7 @@ struct ItemListCardView_Previews: PreviewProvider { .allowAuthenticatorAppSyncingInSettingsToViewAllYourVerificationCodesHere, buttonText: Localizations.takeMeToTheAppSettings, leftImage: { - Image(decorative: Asset.Images.syncArrow) + Image(decorative: SharedAsset.Icons.arrowSync24) .foregroundColor(Asset.Colors.primaryBitwardenLight.swiftUIColor) .frame(width: 24, height: 24) }, @@ -118,7 +118,7 @@ struct ItemListCardView_Previews: PreviewProvider { .allowAuthenticatorAppSyncingInSettingsToViewAllYourVerificationCodesHere, buttonText: Localizations.takeMeToTheAppSettings, leftImage: { - Image(decorative: Asset.Images.syncArrow) + Image(decorative: SharedAsset.Icons.arrowSync24) .foregroundColor(Asset.Colors.primaryBitwardenLight.swiftUIColor) .frame(width: 24, height: 24) }, diff --git a/AuthenticatorShared/UI/Vault/ItemList/ItemList/ItemListView.swift b/AuthenticatorShared/UI/Vault/ItemList/ItemList/ItemListView.swift index 32ceab9682..c1c026763c 100644 --- a/AuthenticatorShared/UI/Vault/ItemList/ItemList/ItemListView.swift +++ b/AuthenticatorShared/UI/Vault/ItemList/ItemList/ItemListView.swift @@ -135,7 +135,7 @@ private struct SearchableItemListView: View { // swiftlint:disable:this type_bod bodyText: Localizations.storeAllOfYourLoginsAndSyncVerificationCodesDirectlyWithTheAuthenticatorApp, buttonText: Localizations.downloadTheBitwardenApp, leftImage: { - Image(decorative: Asset.Images.bwLogo) + Image(decorative: SharedAsset.Icons.shield24) .foregroundColor(Asset.Colors.primaryBitwardenLight.swiftUIColor) .frame(width: 24, height: 24) }, @@ -159,7 +159,7 @@ private struct SearchableItemListView: View { // swiftlint:disable:this type_bod .allowAuthenticatorAppSyncingInSettingsToViewAllYourVerificationCodesHere, buttonText: Localizations.takeMeToTheAppSettings, leftImage: { - Image(decorative: Asset.Images.syncArrow) + Image(decorative: SharedAsset.Icons.arrowSync24) .foregroundColor(Asset.Colors.primaryBitwardenLight.swiftUIColor) .frame(width: 24, height: 24) }, @@ -216,7 +216,7 @@ private struct SearchableItemListView: View { // swiftlint:disable:this type_bod HStack(spacing: 4) { Text(Localizations.copy) Spacer() - Image(decorative: Asset.Images.copy) + Image(decorative: SharedAsset.Icons.copy16) .imageStyle(.accessoryIcon(scaleWithFont: true)) } } @@ -228,7 +228,7 @@ private struct SearchableItemListView: View { // swiftlint:disable:this type_bod HStack(spacing: 4) { Text(Localizations.edit) Spacer() - Image(decorative: Asset.Images.pencil) + Image(decorative: SharedAsset.Icons.pencil24) .imageStyle(.accessoryIcon(scaleWithFont: true)) } } @@ -240,7 +240,7 @@ private struct SearchableItemListView: View { // swiftlint:disable:this type_bod HStack(spacing: 4) { Text(Localizations.copyToBitwardenVault) Spacer() - Image(decorative: Asset.Images.rightArrow) + Image(decorative: SharedAsset.Icons.arrowRight16) .imageStyle(.accessoryIcon(scaleWithFont: true)) } } @@ -254,7 +254,7 @@ private struct SearchableItemListView: View { // swiftlint:disable:this type_bod HStack(spacing: 4) { Text(Localizations.delete) Spacer() - Image(decorative: Asset.Images.trash) + Image(decorative: SharedAsset.Icons.trash16) .imageStyle(.accessoryIcon(scaleWithFont: true)) } } diff --git a/AuthenticatorShared/UI/Vault/Views/ItemListItemRow/ItemListItemRowView.swift b/AuthenticatorShared/UI/Vault/Views/ItemListItemRow/ItemListItemRowView.swift index f5c9b8bb5e..c942788590 100644 --- a/AuthenticatorShared/UI/Vault/Views/ItemListItemRow/ItemListItemRowView.swift +++ b/AuthenticatorShared/UI/Vault/Views/ItemListItemRow/ItemListItemRowView.swift @@ -1,4 +1,5 @@ import BitwardenKit +import BitwardenResources import BitwardenSdk import SwiftUI @@ -64,11 +65,11 @@ struct ItemListItemRowView: View { /// @ViewBuilder private func decorativeImage(_ item: ItemListItem, iconBaseURL: URL?, showWebIcons: Bool) -> some View { - placeholderDecorativeImage(Asset.Images.globe) + placeholderDecorativeImage(SharedAsset.Icons.globe24) } /// The placeholder image for the decorative image. - private func placeholderDecorativeImage(_ icon: ImageAsset) -> some View { + private func placeholderDecorativeImage(_ icon: SharedImageAsset) -> some View { Image(decorative: icon) .resizable() .scaledToFit() diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/Contents.json b/BitwardenResources/Icons.xcassets/Cards/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/Contents.json rename to BitwardenResources/Icons.xcassets/Cards/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/amex.imageset/Brand=American Express, Theme=Dark.pdf b/BitwardenResources/Icons.xcassets/Cards/amex.imageset/Brand=American Express, Theme=Dark.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/amex.imageset/Brand=American Express, Theme=Dark.pdf rename to BitwardenResources/Icons.xcassets/Cards/amex.imageset/Brand=American Express, Theme=Dark.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/amex.imageset/Brand=American Express, Theme=Light.pdf b/BitwardenResources/Icons.xcassets/Cards/amex.imageset/Brand=American Express, Theme=Light.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/amex.imageset/Brand=American Express, Theme=Light.pdf rename to BitwardenResources/Icons.xcassets/Cards/amex.imageset/Brand=American Express, Theme=Light.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/amex.imageset/Contents.json b/BitwardenResources/Icons.xcassets/Cards/amex.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/amex.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/Cards/amex.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/diners-club.imageset/Brand=DIner Club, Theme=Dark.pdf b/BitwardenResources/Icons.xcassets/Cards/diners-club.imageset/Brand=DIner Club, Theme=Dark.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/diners-club.imageset/Brand=DIner Club, Theme=Dark.pdf rename to BitwardenResources/Icons.xcassets/Cards/diners-club.imageset/Brand=DIner Club, Theme=Dark.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/diners-club.imageset/Brand=DIner Club, Theme=Light.pdf b/BitwardenResources/Icons.xcassets/Cards/diners-club.imageset/Brand=DIner Club, Theme=Light.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/diners-club.imageset/Brand=DIner Club, Theme=Light.pdf rename to BitwardenResources/Icons.xcassets/Cards/diners-club.imageset/Brand=DIner Club, Theme=Light.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/diners-club.imageset/Contents.json b/BitwardenResources/Icons.xcassets/Cards/diners-club.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/diners-club.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/Cards/diners-club.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/discover.imageset/Brand=Discover, Theme=Dark.pdf b/BitwardenResources/Icons.xcassets/Cards/discover.imageset/Brand=Discover, Theme=Dark.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/discover.imageset/Brand=Discover, Theme=Dark.pdf rename to BitwardenResources/Icons.xcassets/Cards/discover.imageset/Brand=Discover, Theme=Dark.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/discover.imageset/Brand=Discover, Theme=Light.pdf b/BitwardenResources/Icons.xcassets/Cards/discover.imageset/Brand=Discover, Theme=Light.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/discover.imageset/Brand=Discover, Theme=Light.pdf rename to BitwardenResources/Icons.xcassets/Cards/discover.imageset/Brand=Discover, Theme=Light.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/discover.imageset/Contents.json b/BitwardenResources/Icons.xcassets/Cards/discover.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/discover.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/Cards/discover.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/jcb.imageset/Brand=JCB, Theme=Dark.pdf b/BitwardenResources/Icons.xcassets/Cards/jcb.imageset/Brand=JCB, Theme=Dark.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/jcb.imageset/Brand=JCB, Theme=Dark.pdf rename to BitwardenResources/Icons.xcassets/Cards/jcb.imageset/Brand=JCB, Theme=Dark.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/jcb.imageset/Brand=JCB, Theme=Light.pdf b/BitwardenResources/Icons.xcassets/Cards/jcb.imageset/Brand=JCB, Theme=Light.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/jcb.imageset/Brand=JCB, Theme=Light.pdf rename to BitwardenResources/Icons.xcassets/Cards/jcb.imageset/Brand=JCB, Theme=Light.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/jcb.imageset/Contents.json b/BitwardenResources/Icons.xcassets/Cards/jcb.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/jcb.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/Cards/jcb.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/maestro.imageset/Brand=Maestro, Theme=Dark.pdf b/BitwardenResources/Icons.xcassets/Cards/maestro.imageset/Brand=Maestro, Theme=Dark.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/maestro.imageset/Brand=Maestro, Theme=Dark.pdf rename to BitwardenResources/Icons.xcassets/Cards/maestro.imageset/Brand=Maestro, Theme=Dark.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/maestro.imageset/Brand=Maestro, Theme=Light.pdf b/BitwardenResources/Icons.xcassets/Cards/maestro.imageset/Brand=Maestro, Theme=Light.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/maestro.imageset/Brand=Maestro, Theme=Light.pdf rename to BitwardenResources/Icons.xcassets/Cards/maestro.imageset/Brand=Maestro, Theme=Light.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/maestro.imageset/Contents.json b/BitwardenResources/Icons.xcassets/Cards/maestro.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/maestro.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/Cards/maestro.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/mastercard.imageset/Brand=Mastercard, Theme=Dark.pdf b/BitwardenResources/Icons.xcassets/Cards/mastercard.imageset/Brand=Mastercard, Theme=Dark.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/mastercard.imageset/Brand=Mastercard, Theme=Dark.pdf rename to BitwardenResources/Icons.xcassets/Cards/mastercard.imageset/Brand=Mastercard, Theme=Dark.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/mastercard.imageset/Brand=Mastercard, Theme=Light.pdf b/BitwardenResources/Icons.xcassets/Cards/mastercard.imageset/Brand=Mastercard, Theme=Light.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/mastercard.imageset/Brand=Mastercard, Theme=Light.pdf rename to BitwardenResources/Icons.xcassets/Cards/mastercard.imageset/Brand=Mastercard, Theme=Light.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/mastercard.imageset/Contents.json b/BitwardenResources/Icons.xcassets/Cards/mastercard.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/mastercard.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/Cards/mastercard.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/ru-pay.imageset/Brand=RuPay, Theme=Dark.pdf b/BitwardenResources/Icons.xcassets/Cards/ru-pay.imageset/Brand=RuPay, Theme=Dark.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/ru-pay.imageset/Brand=RuPay, Theme=Dark.pdf rename to BitwardenResources/Icons.xcassets/Cards/ru-pay.imageset/Brand=RuPay, Theme=Dark.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/ru-pay.imageset/Brand=RuPay, Theme=Light.pdf b/BitwardenResources/Icons.xcassets/Cards/ru-pay.imageset/Brand=RuPay, Theme=Light.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/ru-pay.imageset/Brand=RuPay, Theme=Light.pdf rename to BitwardenResources/Icons.xcassets/Cards/ru-pay.imageset/Brand=RuPay, Theme=Light.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/ru-pay.imageset/Contents.json b/BitwardenResources/Icons.xcassets/Cards/ru-pay.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/ru-pay.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/Cards/ru-pay.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/union-pay.imageset/Brand=UnionPay, Theme=Dark.pdf b/BitwardenResources/Icons.xcassets/Cards/union-pay.imageset/Brand=UnionPay, Theme=Dark.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/union-pay.imageset/Brand=UnionPay, Theme=Dark.pdf rename to BitwardenResources/Icons.xcassets/Cards/union-pay.imageset/Brand=UnionPay, Theme=Dark.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/union-pay.imageset/Brand=UnionPay, Theme=Light.pdf b/BitwardenResources/Icons.xcassets/Cards/union-pay.imageset/Brand=UnionPay, Theme=Light.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/union-pay.imageset/Brand=UnionPay, Theme=Light.pdf rename to BitwardenResources/Icons.xcassets/Cards/union-pay.imageset/Brand=UnionPay, Theme=Light.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/union-pay.imageset/Contents.json b/BitwardenResources/Icons.xcassets/Cards/union-pay.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/union-pay.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/Cards/union-pay.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/visa.imageset/Brand=Visa, Theme=Dark.pdf b/BitwardenResources/Icons.xcassets/Cards/visa.imageset/Brand=Visa, Theme=Dark.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/visa.imageset/Brand=Visa, Theme=Dark.pdf rename to BitwardenResources/Icons.xcassets/Cards/visa.imageset/Brand=Visa, Theme=Dark.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/visa.imageset/Brand=Visa, Theme=Light.pdf b/BitwardenResources/Icons.xcassets/Cards/visa.imageset/Brand=Visa, Theme=Light.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/visa.imageset/Brand=Visa, Theme=Light.pdf rename to BitwardenResources/Icons.xcassets/Cards/visa.imageset/Brand=Visa, Theme=Light.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/visa.imageset/Contents.json b/BitwardenResources/Icons.xcassets/Cards/visa.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Cards/visa.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/Cards/visa.imageset/Contents.json diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/Contents.json b/BitwardenResources/Icons.xcassets/Contents.json similarity index 100% rename from AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/Contents.json rename to BitwardenResources/Icons.xcassets/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/Contents.json b/BitwardenResources/Icons.xcassets/TabBar/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/Contents.json rename to BitwardenResources/Icons.xcassets/TabBar/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/generator-active.imageset/Contents.json b/BitwardenResources/Icons.xcassets/TabBar/generator-active.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/generator-active.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/TabBar/generator-active.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/generator-active.imageset/generator-active-dark.pdf b/BitwardenResources/Icons.xcassets/TabBar/generator-active.imageset/generator-active-dark.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/generator-active.imageset/generator-active-dark.pdf rename to BitwardenResources/Icons.xcassets/TabBar/generator-active.imageset/generator-active-dark.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/generator-active.imageset/generator-active-light.pdf b/BitwardenResources/Icons.xcassets/TabBar/generator-active.imageset/generator-active-light.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/generator-active.imageset/generator-active-light.pdf rename to BitwardenResources/Icons.xcassets/TabBar/generator-active.imageset/generator-active-light.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/generator-idle.imageset/Contents.json b/BitwardenResources/Icons.xcassets/TabBar/generator-idle.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/generator-idle.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/TabBar/generator-idle.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/generator-idle.imageset/generator-idle-dark.pdf b/BitwardenResources/Icons.xcassets/TabBar/generator-idle.imageset/generator-idle-dark.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/generator-idle.imageset/generator-idle-dark.pdf rename to BitwardenResources/Icons.xcassets/TabBar/generator-idle.imageset/generator-idle-dark.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/generator-idle.imageset/generator-idle-light.pdf b/BitwardenResources/Icons.xcassets/TabBar/generator-idle.imageset/generator-idle-light.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/generator-idle.imageset/generator-idle-light.pdf rename to BitwardenResources/Icons.xcassets/TabBar/generator-idle.imageset/generator-idle-light.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/send-active.imageset/Contents.json b/BitwardenResources/Icons.xcassets/TabBar/send-active.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/send-active.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/TabBar/send-active.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/send-active.imageset/send-active-dark.pdf b/BitwardenResources/Icons.xcassets/TabBar/send-active.imageset/send-active-dark.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/send-active.imageset/send-active-dark.pdf rename to BitwardenResources/Icons.xcassets/TabBar/send-active.imageset/send-active-dark.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/send-active.imageset/send-active-light.pdf b/BitwardenResources/Icons.xcassets/TabBar/send-active.imageset/send-active-light.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/send-active.imageset/send-active-light.pdf rename to BitwardenResources/Icons.xcassets/TabBar/send-active.imageset/send-active-light.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/send-idle.imageset/Contents.json b/BitwardenResources/Icons.xcassets/TabBar/send-idle.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/send-idle.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/TabBar/send-idle.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/send-idle.imageset/send-idle-dark.pdf b/BitwardenResources/Icons.xcassets/TabBar/send-idle.imageset/send-idle-dark.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/send-idle.imageset/send-idle-dark.pdf rename to BitwardenResources/Icons.xcassets/TabBar/send-idle.imageset/send-idle-dark.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/send-idle.imageset/send-idle-light.pdf b/BitwardenResources/Icons.xcassets/TabBar/send-idle.imageset/send-idle-light.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/send-idle.imageset/send-idle-light.pdf rename to BitwardenResources/Icons.xcassets/TabBar/send-idle.imageset/send-idle-light.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/settings-active.imageset/Contents.json b/BitwardenResources/Icons.xcassets/TabBar/settings-active.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/settings-active.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/TabBar/settings-active.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/settings-active.imageset/settings-active-dark.pdf b/BitwardenResources/Icons.xcassets/TabBar/settings-active.imageset/settings-active-dark.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/settings-active.imageset/settings-active-dark.pdf rename to BitwardenResources/Icons.xcassets/TabBar/settings-active.imageset/settings-active-dark.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/settings-active.imageset/settings-active-light.pdf b/BitwardenResources/Icons.xcassets/TabBar/settings-active.imageset/settings-active-light.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/settings-active.imageset/settings-active-light.pdf rename to BitwardenResources/Icons.xcassets/TabBar/settings-active.imageset/settings-active-light.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/settings-idle.imageset/Contents.json b/BitwardenResources/Icons.xcassets/TabBar/settings-idle.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/settings-idle.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/TabBar/settings-idle.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/settings-idle.imageset/settings-idle-dark.pdf b/BitwardenResources/Icons.xcassets/TabBar/settings-idle.imageset/settings-idle-dark.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/settings-idle.imageset/settings-idle-dark.pdf rename to BitwardenResources/Icons.xcassets/TabBar/settings-idle.imageset/settings-idle-dark.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/settings-idle.imageset/settings-idle-light.pdf b/BitwardenResources/Icons.xcassets/TabBar/settings-idle.imageset/settings-idle-light.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/settings-idle.imageset/settings-idle-light.pdf rename to BitwardenResources/Icons.xcassets/TabBar/settings-idle.imageset/settings-idle-light.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/vault-active.imageset/Contents.json b/BitwardenResources/Icons.xcassets/TabBar/vault-active.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/vault-active.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/TabBar/vault-active.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/vault-active.imageset/vault-active-dark.pdf b/BitwardenResources/Icons.xcassets/TabBar/vault-active.imageset/vault-active-dark.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/vault-active.imageset/vault-active-dark.pdf rename to BitwardenResources/Icons.xcassets/TabBar/vault-active.imageset/vault-active-dark.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/vault-active.imageset/vault-actve-light.pdf b/BitwardenResources/Icons.xcassets/TabBar/vault-active.imageset/vault-actve-light.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/vault-active.imageset/vault-actve-light.pdf rename to BitwardenResources/Icons.xcassets/TabBar/vault-active.imageset/vault-actve-light.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/vault-idle.imageset/Contents.json b/BitwardenResources/Icons.xcassets/TabBar/vault-idle.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/vault-idle.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/TabBar/vault-idle.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/vault-idle.imageset/vault-idle-dark.pdf b/BitwardenResources/Icons.xcassets/TabBar/vault-idle.imageset/vault-idle-dark.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/vault-idle.imageset/vault-idle-dark.pdf rename to BitwardenResources/Icons.xcassets/TabBar/vault-idle.imageset/vault-idle-dark.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/vault-idle.imageset/vault-idle-light.pdf b/BitwardenResources/Icons.xcassets/TabBar/vault-idle.imageset/vault-idle-light.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/TabBar/vault-idle.imageset/vault-idle-light.pdf rename to BitwardenResources/Icons.xcassets/TabBar/vault-idle.imageset/vault-idle-light.pdf diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/right-arrow.imageset/Contents.json b/BitwardenResources/Icons.xcassets/arrow-right16.imageset/Contents.json similarity index 100% rename from AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/right-arrow.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/arrow-right16.imageset/Contents.json diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/right-arrow.imageset/right-arrow.svg b/BitwardenResources/Icons.xcassets/arrow-right16.imageset/right-arrow.svg similarity index 100% rename from AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/right-arrow.imageset/right-arrow.svg rename to BitwardenResources/Icons.xcassets/arrow-right16.imageset/right-arrow.svg diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/sync-arrow.imageset/Contents.json b/BitwardenResources/Icons.xcassets/arrow-sync24.imageset/Contents.json similarity index 100% rename from AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/sync-arrow.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/arrow-sync24.imageset/Contents.json diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/sync-arrow.imageset/icon.pdf b/BitwardenResources/Icons.xcassets/arrow-sync24.imageset/icon.pdf similarity index 100% rename from AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/sync-arrow.imageset/icon.pdf rename to BitwardenResources/Icons.xcassets/arrow-sync24.imageset/icon.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/arrow-up.imageset/Contents.json b/BitwardenResources/Icons.xcassets/arrow-up.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/arrow-up.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/arrow-up.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/arrow-up.imageset/arrow-darkmode-up.pdf b/BitwardenResources/Icons.xcassets/arrow-up.imageset/arrow-darkmode-up.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/arrow-up.imageset/arrow-darkmode-up.pdf rename to BitwardenResources/Icons.xcassets/arrow-up.imageset/arrow-darkmode-up.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/arrow-up.imageset/arrow-up.pdf b/BitwardenResources/Icons.xcassets/arrow-up.imageset/arrow-up.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/arrow-up.imageset/arrow-up.pdf rename to BitwardenResources/Icons.xcassets/arrow-up.imageset/arrow-up.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/business16.imageset/Contents.json b/BitwardenResources/Icons.xcassets/business16.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/business16.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/business16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/business16.imageset/business16.pdf b/BitwardenResources/Icons.xcassets/business16.imageset/business16.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/business16.imageset/business16.pdf rename to BitwardenResources/Icons.xcassets/business16.imageset/business16.pdf diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/camera.imageset/Contents.json b/BitwardenResources/Icons.xcassets/camera16.imageset/Contents.json similarity index 100% rename from AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/camera.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/camera16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/camera16.imageset/camera.pdf b/BitwardenResources/Icons.xcassets/camera16.imageset/camera.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/camera16.imageset/camera.pdf rename to BitwardenResources/Icons.xcassets/camera16.imageset/camera.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/camera24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/camera24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/camera24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/camera24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/camera24.imageset/camera24.pdf b/BitwardenResources/Icons.xcassets/camera24.imageset/camera24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/camera24.imageset/camera24.pdf rename to BitwardenResources/Icons.xcassets/camera24.imageset/camera24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/card24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/card24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/card24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/card24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/card24.imageset/card24.pdf b/BitwardenResources/Icons.xcassets/card24.imageset/card24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/card24.imageset/card24.pdf rename to BitwardenResources/Icons.xcassets/card24.imageset/card24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/check-circle24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/check-circle24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/check-circle24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/check-circle24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/check-circle24.imageset/check-circle24.pdf b/BitwardenResources/Icons.xcassets/check-circle24.imageset/check-circle24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/check-circle24.imageset/check-circle24.pdf rename to BitwardenResources/Icons.xcassets/check-circle24.imageset/check-circle24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/check-square16.imageset/Contents.json b/BitwardenResources/Icons.xcassets/check-square16.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/check-square16.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/check-square16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/check-square16.imageset/check-square.pdf b/BitwardenResources/Icons.xcassets/check-square16.imageset/check-square.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/check-square16.imageset/check-square.pdf rename to BitwardenResources/Icons.xcassets/check-square16.imageset/check-square.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/check12.imageset/Contents.json b/BitwardenResources/Icons.xcassets/check12.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/check12.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/check12.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/check12.imageset/check12.pdf b/BitwardenResources/Icons.xcassets/check12.imageset/check12.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/check12.imageset/check12.pdf rename to BitwardenResources/Icons.xcassets/check12.imageset/check12.pdf diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/check.imageset/Contents.json b/BitwardenResources/Icons.xcassets/check16.imageset/Contents.json similarity index 100% rename from AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/check.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/check16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/check16.imageset/check.pdf b/BitwardenResources/Icons.xcassets/check16.imageset/check.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/check16.imageset/check.pdf rename to BitwardenResources/Icons.xcassets/check16.imageset/check.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/check24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/check24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/check24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/check24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/check24.imageset/check24.pdf b/BitwardenResources/Icons.xcassets/check24.imageset/check24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/check24.imageset/check24.pdf rename to BitwardenResources/Icons.xcassets/check24.imageset/check24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/chevron-down16.imageset/Contents.json b/BitwardenResources/Icons.xcassets/chevron-down16.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/chevron-down16.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/chevron-down16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/chevron-down16.imageset/chevron-down16.pdf b/BitwardenResources/Icons.xcassets/chevron-down16.imageset/chevron-down16.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/chevron-down16.imageset/chevron-down16.pdf rename to BitwardenResources/Icons.xcassets/chevron-down16.imageset/chevron-down16.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/chevron-down24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/chevron-down24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/chevron-down24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/chevron-down24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/chevron-down24.imageset/chevron-down24.pdf b/BitwardenResources/Icons.xcassets/chevron-down24.imageset/chevron-down24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/chevron-down24.imageset/chevron-down24.pdf rename to BitwardenResources/Icons.xcassets/chevron-down24.imageset/chevron-down24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/chevron-right16.imageset/Contents.json b/BitwardenResources/Icons.xcassets/chevron-right16.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/chevron-right16.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/chevron-right16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/chevron-right16.imageset/chevron-right.pdf b/BitwardenResources/Icons.xcassets/chevron-right16.imageset/chevron-right.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/chevron-right16.imageset/chevron-right.pdf rename to BitwardenResources/Icons.xcassets/chevron-right16.imageset/chevron-right.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/circle-x16.imageset/Contents.json b/BitwardenResources/Icons.xcassets/circle-x16.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/circle-x16.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/circle-x16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/circle-x16.imageset/circle-x16.pdf b/BitwardenResources/Icons.xcassets/circle-x16.imageset/circle-x16.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/circle-x16.imageset/circle-x16.pdf rename to BitwardenResources/Icons.xcassets/circle-x16.imageset/circle-x16.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/clock16.imageset/Contents.json b/BitwardenResources/Icons.xcassets/clock16.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/clock16.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/clock16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/clock16.imageset/clock16.pdf b/BitwardenResources/Icons.xcassets/clock16.imageset/clock16.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/clock16.imageset/clock16.pdf rename to BitwardenResources/Icons.xcassets/clock16.imageset/clock16.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/clock24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/clock24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/clock24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/clock24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/clock24.imageset/clock24.pdf b/BitwardenResources/Icons.xcassets/clock24.imageset/clock24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/clock24.imageset/clock24.pdf rename to BitwardenResources/Icons.xcassets/clock24.imageset/clock24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/close16.imageset/Contents.json b/BitwardenResources/Icons.xcassets/close16.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/close16.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/close16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/close16.imageset/close.pdf b/BitwardenResources/Icons.xcassets/close16.imageset/close.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/close16.imageset/close.pdf rename to BitwardenResources/Icons.xcassets/close16.imageset/close.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/cog16.imageset/Contents.json b/BitwardenResources/Icons.xcassets/cog16.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/cog16.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/cog16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/cog16.imageset/cog16.pdf b/BitwardenResources/Icons.xcassets/cog16.imageset/cog16.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/cog16.imageset/cog16.pdf rename to BitwardenResources/Icons.xcassets/cog16.imageset/cog16.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/cog24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/cog24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/cog24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/cog24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/cog24.imageset/cog24.pdf b/BitwardenResources/Icons.xcassets/cog24.imageset/cog24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/cog24.imageset/cog24.pdf rename to BitwardenResources/Icons.xcassets/cog24.imageset/cog24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/collections16.imageset/Contents.json b/BitwardenResources/Icons.xcassets/collections16.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/collections16.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/collections16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/collections16.imageset/collections16.pdf b/BitwardenResources/Icons.xcassets/collections16.imageset/collections16.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/collections16.imageset/collections16.pdf rename to BitwardenResources/Icons.xcassets/collections16.imageset/collections16.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/collections24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/collections24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/collections24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/collections24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/collections24.imageset/collections24.pdf b/BitwardenResources/Icons.xcassets/collections24.imageset/collections24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/collections24.imageset/collections24.pdf rename to BitwardenResources/Icons.xcassets/collections24.imageset/collections24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/copy16.imageset/Contents.json b/BitwardenResources/Icons.xcassets/copy16.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/copy16.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/copy16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/copy16.imageset/copy16.pdf b/BitwardenResources/Icons.xcassets/copy16.imageset/copy16.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/copy16.imageset/copy16.pdf rename to BitwardenResources/Icons.xcassets/copy16.imageset/copy16.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/copy24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/copy24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/copy24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/copy24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/copy24.imageset/copy24.pdf b/BitwardenResources/Icons.xcassets/copy24.imageset/copy24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/copy24.imageset/copy24.pdf rename to BitwardenResources/Icons.xcassets/copy24.imageset/copy24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/desktop24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/desktop24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/desktop24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/desktop24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/desktop24.imageset/desktop.pdf b/BitwardenResources/Icons.xcassets/desktop24.imageset/desktop.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/desktop24.imageset/desktop.pdf rename to BitwardenResources/Icons.xcassets/desktop24.imageset/desktop.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/do-not16.imageset/Contents.json b/BitwardenResources/Icons.xcassets/do-not16.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/do-not16.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/do-not16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/do-not16.imageset/do-not.pdf b/BitwardenResources/Icons.xcassets/do-not16.imageset/do-not.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/do-not16.imageset/do-not.pdf rename to BitwardenResources/Icons.xcassets/do-not16.imageset/do-not.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/download24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/download24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/download24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/download24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/download24.imageset/download24.pdf b/BitwardenResources/Icons.xcassets/download24.imageset/download24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/download24.imageset/download24.pdf rename to BitwardenResources/Icons.xcassets/download24.imageset/download24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/ellipsis-horizontal24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/ellipsis-horizontal24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/ellipsis-horizontal24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/ellipsis-horizontal24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/ellipsis-horizontal24.imageset/ellipsis-horizontal24.pdf b/BitwardenResources/Icons.xcassets/ellipsis-horizontal24.imageset/ellipsis-horizontal24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/ellipsis-horizontal24.imageset/ellipsis-horizontal24.pdf rename to BitwardenResources/Icons.xcassets/ellipsis-horizontal24.imageset/ellipsis-horizontal24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/ellipsis-vertical24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/ellipsis-vertical24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/ellipsis-vertical24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/ellipsis-vertical24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/ellipsis-vertical24.imageset/ellipsis-vertical24.pdf b/BitwardenResources/Icons.xcassets/ellipsis-vertical24.imageset/ellipsis-vertical24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/ellipsis-vertical24.imageset/ellipsis-vertical24.pdf rename to BitwardenResources/Icons.xcassets/ellipsis-vertical24.imageset/ellipsis-vertical24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/external-link16.imageset/Contents.json b/BitwardenResources/Icons.xcassets/external-link16.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/external-link16.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/external-link16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/external-link16.imageset/external-link16.pdf b/BitwardenResources/Icons.xcassets/external-link16.imageset/external-link16.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/external-link16.imageset/external-link16.pdf rename to BitwardenResources/Icons.xcassets/external-link16.imageset/external-link16.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/external-link24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/external-link24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/external-link24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/external-link24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/external-link24.imageset/external-link24.pdf b/BitwardenResources/Icons.xcassets/external-link24.imageset/external-link24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/external-link24.imageset/external-link24.pdf rename to BitwardenResources/Icons.xcassets/external-link24.imageset/external-link24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/eye-slash24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/eye-slash24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/eye-slash24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/eye-slash24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/eye-slash24.imageset/eye-slash24.pdf b/BitwardenResources/Icons.xcassets/eye-slash24.imageset/eye-slash24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/eye-slash24.imageset/eye-slash24.pdf rename to BitwardenResources/Icons.xcassets/eye-slash24.imageset/eye-slash24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/eye24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/eye24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/eye24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/eye24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/eye24.imageset/eye24.pdf b/BitwardenResources/Icons.xcassets/eye24.imageset/eye24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/eye24.imageset/eye24.pdf rename to BitwardenResources/Icons.xcassets/eye24.imageset/eye24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/file-text24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/file-text24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/file-text24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/file-text24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/file-text24.imageset/file-text24.pdf b/BitwardenResources/Icons.xcassets/file-text24.imageset/file-text24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/file-text24.imageset/file-text24.pdf rename to BitwardenResources/Icons.xcassets/file-text24.imageset/file-text24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/file-upload24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/file-upload24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/file-upload24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/file-upload24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/file-upload24.imageset/file_upload.pdf b/BitwardenResources/Icons.xcassets/file-upload24.imageset/file_upload.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/file-upload24.imageset/file_upload.pdf rename to BitwardenResources/Icons.xcassets/file-upload24.imageset/file_upload.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/file24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/file24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/file24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/file24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/file24.imageset/file24.pdf b/BitwardenResources/Icons.xcassets/file24.imageset/file24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/file24.imageset/file24.pdf rename to BitwardenResources/Icons.xcassets/file24.imageset/file24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/folder16.imageset/Contents.json b/BitwardenResources/Icons.xcassets/folder16.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/folder16.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/folder16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/folder16.imageset/folder16.pdf b/BitwardenResources/Icons.xcassets/folder16.imageset/folder16.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/folder16.imageset/folder16.pdf rename to BitwardenResources/Icons.xcassets/folder16.imageset/folder16.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/folder24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/folder24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/folder24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/folder24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/folder24.imageset/folder24.pdf b/BitwardenResources/Icons.xcassets/folder24.imageset/folder24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/folder24.imageset/folder24.pdf rename to BitwardenResources/Icons.xcassets/folder24.imageset/folder24.pdf diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/gear-filled.imageset/Contents.json b/BitwardenResources/Icons.xcassets/gear-filled24.imageset/Contents.json similarity index 100% rename from AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/gear-filled.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/gear-filled24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/gear-filled24.imageset/gear-filled.pdf b/BitwardenResources/Icons.xcassets/gear-filled24.imageset/gear-filled.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/gear-filled24.imageset/gear-filled.pdf rename to BitwardenResources/Icons.xcassets/gear-filled24.imageset/gear-filled.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/generate16.imageset/Contents.json b/BitwardenResources/Icons.xcassets/generate16.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/generate16.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/generate16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/generate16.imageset/generate.pdf b/BitwardenResources/Icons.xcassets/generate16.imageset/generate.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/generate16.imageset/generate.pdf rename to BitwardenResources/Icons.xcassets/generate16.imageset/generate.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/generate24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/generate24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/generate24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/generate24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/generate24.imageset/generate24.pdf b/BitwardenResources/Icons.xcassets/generate24.imageset/generate24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/generate24.imageset/generate24.pdf rename to BitwardenResources/Icons.xcassets/generate24.imageset/generate24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/generator-idle.imageset/Contents.json b/BitwardenResources/Icons.xcassets/generator-idle.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/generator-idle.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/generator-idle.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/generator-idle.imageset/generator-idle.pdf b/BitwardenResources/Icons.xcassets/generator-idle.imageset/generator-idle.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/generator-idle.imageset/generator-idle.pdf rename to BitwardenResources/Icons.xcassets/generator-idle.imageset/generator-idle.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/globe24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/globe24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/globe24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/globe24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/globe24.imageset/globe24.pdf b/BitwardenResources/Icons.xcassets/globe24.imageset/globe24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/globe24.imageset/globe24.pdf rename to BitwardenResources/Icons.xcassets/globe24.imageset/globe24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/horizontal-dots16.imageset/Contents.json b/BitwardenResources/Icons.xcassets/horizontal-dots16.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/horizontal-dots16.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/horizontal-dots16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/horizontal-dots16.imageset/pdf.pdf b/BitwardenResources/Icons.xcassets/horizontal-dots16.imageset/pdf.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/horizontal-dots16.imageset/pdf.pdf rename to BitwardenResources/Icons.xcassets/horizontal-dots16.imageset/pdf.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/id-card24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/id-card24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/id-card24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/id-card24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/id-card24.imageset/id-card24.pdf b/BitwardenResources/Icons.xcassets/id-card24.imageset/id-card24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/id-card24.imageset/id-card24.pdf rename to BitwardenResources/Icons.xcassets/id-card24.imageset/id-card24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/information-circle24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/information-circle24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/information-circle24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/information-circle24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/information-circle24.imageset/information-circle24.pdf b/BitwardenResources/Icons.xcassets/information-circle24.imageset/information-circle24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/information-circle24.imageset/information-circle24.pdf rename to BitwardenResources/Icons.xcassets/information-circle24.imageset/information-circle24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/key16.imageset/Contents.json b/BitwardenResources/Icons.xcassets/key16.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/key16.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/key16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/key16.imageset/key.pdf b/BitwardenResources/Icons.xcassets/key16.imageset/key.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/key16.imageset/key.pdf rename to BitwardenResources/Icons.xcassets/key16.imageset/key.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/key24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/key24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/key24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/key24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/key24.imageset/Name=key, Size=24.pdf b/BitwardenResources/Icons.xcassets/key24.imageset/Name=key, Size=24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/key24.imageset/Name=key, Size=24.pdf rename to BitwardenResources/Icons.xcassets/key24.imageset/Name=key, Size=24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/lightbulb24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/lightbulb24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/lightbulb24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/lightbulb24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/lightbulb24.imageset/lightbulb24.pdf b/BitwardenResources/Icons.xcassets/lightbulb24.imageset/lightbulb24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/lightbulb24.imageset/lightbulb24.pdf rename to BitwardenResources/Icons.xcassets/lightbulb24.imageset/lightbulb24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/link16.imageset/Contents.json b/BitwardenResources/Icons.xcassets/link16.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/link16.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/link16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/link16.imageset/link.pdf b/BitwardenResources/Icons.xcassets/link16.imageset/link.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/link16.imageset/link.pdf rename to BitwardenResources/Icons.xcassets/link16.imageset/link.pdf diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/locked-filled.imageset/Contents.json b/BitwardenResources/Icons.xcassets/locked-filled24.imageset/Contents.json similarity index 100% rename from AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/locked-filled.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/locked-filled24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/locked-filled24.imageset/locked-filled.pdf b/BitwardenResources/Icons.xcassets/locked-filled24.imageset/locked-filled.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/locked-filled24.imageset/locked-filled.pdf rename to BitwardenResources/Icons.xcassets/locked-filled24.imageset/locked-filled.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/locked24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/locked24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/locked24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/locked24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/locked24.imageset/locked24.pdf b/BitwardenResources/Icons.xcassets/locked24.imageset/locked24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/locked24.imageset/locked24.pdf rename to BitwardenResources/Icons.xcassets/locked24.imageset/locked24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/minus-circle24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/minus-circle24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/minus-circle24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/minus-circle24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/minus-circle24.imageset/minus-circle24.pdf b/BitwardenResources/Icons.xcassets/minus-circle24.imageset/minus-circle24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/minus-circle24.imageset/minus-circle24.pdf rename to BitwardenResources/Icons.xcassets/minus-circle24.imageset/minus-circle24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/minus16.imageset/Contents.json b/BitwardenResources/Icons.xcassets/minus16.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/minus16.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/minus16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/minus16.imageset/minus16.pdf b/BitwardenResources/Icons.xcassets/minus16.imageset/minus16.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/minus16.imageset/minus16.pdf rename to BitwardenResources/Icons.xcassets/minus16.imageset/minus16.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/mobile16.imageset/Contents.json b/BitwardenResources/Icons.xcassets/mobile16.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/mobile16.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/mobile16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/mobile16.imageset/mobile.pdf b/BitwardenResources/Icons.xcassets/mobile16.imageset/mobile.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/mobile16.imageset/mobile.pdf rename to BitwardenResources/Icons.xcassets/mobile16.imageset/mobile.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/other.imageset/Contents.json b/BitwardenResources/Icons.xcassets/other.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/other.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/other.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/other.imageset/other-dark.pdf b/BitwardenResources/Icons.xcassets/other.imageset/other-dark.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/other.imageset/other-dark.pdf rename to BitwardenResources/Icons.xcassets/other.imageset/other-dark.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/other.imageset/other.pdf b/BitwardenResources/Icons.xcassets/other.imageset/other.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/other.imageset/other.pdf rename to BitwardenResources/Icons.xcassets/other.imageset/other.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/paint-brush.imageset/Contents.json b/BitwardenResources/Icons.xcassets/paint-brush.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/paint-brush.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/paint-brush.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/paint-brush.imageset/paint-brush-dark.pdf b/BitwardenResources/Icons.xcassets/paint-brush.imageset/paint-brush-dark.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/paint-brush.imageset/paint-brush-dark.pdf rename to BitwardenResources/Icons.xcassets/paint-brush.imageset/paint-brush-dark.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/paint-brush.imageset/paint-brush.pdf b/BitwardenResources/Icons.xcassets/paint-brush.imageset/paint-brush.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/paint-brush.imageset/paint-brush.pdf rename to BitwardenResources/Icons.xcassets/paint-brush.imageset/paint-brush.pdf diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/paperclip.imageset/Contents.json b/BitwardenResources/Icons.xcassets/paperclip16.imageset/Contents.json similarity index 100% rename from AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/paperclip.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/paperclip16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/paperclip16.imageset/paperclip.pdf b/BitwardenResources/Icons.xcassets/paperclip16.imageset/paperclip.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/paperclip16.imageset/paperclip.pdf rename to BitwardenResources/Icons.xcassets/paperclip16.imageset/paperclip.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/passkey24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/passkey24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/passkey24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/passkey24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/passkey24.imageset/passkey24.pdf b/BitwardenResources/Icons.xcassets/passkey24.imageset/passkey24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/passkey24.imageset/passkey24.pdf rename to BitwardenResources/Icons.xcassets/passkey24.imageset/passkey24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/pencil24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/pencil24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/pencil24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/pencil24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/pencil24.imageset/pencil24.pdf b/BitwardenResources/Icons.xcassets/pencil24.imageset/pencil24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/pencil24.imageset/pencil24.pdf rename to BitwardenResources/Icons.xcassets/pencil24.imageset/pencil24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/pencil32.imageset/Contents.json b/BitwardenResources/Icons.xcassets/pencil32.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/pencil32.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/pencil32.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/pencil32.imageset/pencil32.pdf b/BitwardenResources/Icons.xcassets/pencil32.imageset/pencil32.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/pencil32.imageset/pencil32.pdf rename to BitwardenResources/Icons.xcassets/pencil32.imageset/pencil32.pdf diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/plus.imageset/Contents.json b/BitwardenResources/Icons.xcassets/plus16.imageset/Contents.json similarity index 100% rename from AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/plus.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/plus16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/plus16.imageset/plus.pdf b/BitwardenResources/Icons.xcassets/plus16.imageset/plus.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/plus16.imageset/plus.pdf rename to BitwardenResources/Icons.xcassets/plus16.imageset/plus.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/plus24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/plus24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/plus24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/plus24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/plus24.imageset/plus24.pdf b/BitwardenResources/Icons.xcassets/plus24.imageset/plus24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/plus24.imageset/plus24.pdf rename to BitwardenResources/Icons.xcassets/plus24.imageset/plus24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/plus32.imageset/Contents.json b/BitwardenResources/Icons.xcassets/plus32.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/plus32.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/plus32.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/plus32.imageset/plus32.pdf b/BitwardenResources/Icons.xcassets/plus32.imageset/plus32.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/plus32.imageset/plus32.pdf rename to BitwardenResources/Icons.xcassets/plus32.imageset/plus32.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/provider16.imageset/Contents.json b/BitwardenResources/Icons.xcassets/provider16.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/provider16.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/provider16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/provider16.imageset/provider.pdf b/BitwardenResources/Icons.xcassets/provider16.imageset/provider.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/provider16.imageset/provider.pdf rename to BitwardenResources/Icons.xcassets/provider16.imageset/provider.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/puzzle24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/puzzle24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/puzzle24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/puzzle24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/puzzle24.imageset/puzzle.pdf b/BitwardenResources/Icons.xcassets/puzzle24.imageset/puzzle.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/puzzle24.imageset/puzzle.pdf rename to BitwardenResources/Icons.xcassets/puzzle24.imageset/puzzle.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/question-circle12.imageset/Contents.json b/BitwardenResources/Icons.xcassets/question-circle12.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/question-circle12.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/question-circle12.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/question-circle12.imageset/circle-question-mark-12.pdf b/BitwardenResources/Icons.xcassets/question-circle12.imageset/circle-question-mark-12.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/question-circle12.imageset/circle-question-mark-12.pdf rename to BitwardenResources/Icons.xcassets/question-circle12.imageset/circle-question-mark-12.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/question-circle16.imageset/Contents.json b/BitwardenResources/Icons.xcassets/question-circle16.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/question-circle16.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/question-circle16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/question-circle16.imageset/question-circle.pdf b/BitwardenResources/Icons.xcassets/question-circle16.imageset/question-circle.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/question-circle16.imageset/question-circle.pdf rename to BitwardenResources/Icons.xcassets/question-circle16.imageset/question-circle.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/question-circle24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/question-circle24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/question-circle24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/question-circle24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/question-circle24.imageset/question-circle24.pdf b/BitwardenResources/Icons.xcassets/question-circle24.imageset/question-circle24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/question-circle24.imageset/question-circle24.pdf rename to BitwardenResources/Icons.xcassets/question-circle24.imageset/question-circle24.pdf diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/recovery-codes.imageset/Contents.json b/BitwardenResources/Icons.xcassets/recovery-codes.imageset/Contents.json similarity index 100% rename from AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/recovery-codes.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/recovery-codes.imageset/Contents.json diff --git a/AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/recovery-codes.imageset/recovery-codes.pdf b/BitwardenResources/Icons.xcassets/recovery-codes.imageset/recovery-codes.pdf similarity index 100% rename from AuthenticatorShared/UI/Platform/Application/Support/Images.xcassets/Icons/recovery-codes.imageset/recovery-codes.pdf rename to BitwardenResources/Icons.xcassets/recovery-codes.imageset/recovery-codes.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/restart-filled24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/restart-filled24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/restart-filled24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/restart-filled24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/restart-filled24.imageset/restart-filled.pdf b/BitwardenResources/Icons.xcassets/restart-filled24.imageset/restart-filled.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/restart-filled24.imageset/restart-filled.pdf rename to BitwardenResources/Icons.xcassets/restart-filled24.imageset/restart-filled.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/search16.imageset/Contents.json b/BitwardenResources/Icons.xcassets/search16.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/search16.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/search16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/search16.imageset/search16.pdf b/BitwardenResources/Icons.xcassets/search16.imageset/search16.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/search16.imageset/search16.pdf rename to BitwardenResources/Icons.xcassets/search16.imageset/search16.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/search24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/search24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/search24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/search24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/search24.imageset/search24.pdf b/BitwardenResources/Icons.xcassets/search24.imageset/search24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/search24.imageset/search24.pdf rename to BitwardenResources/Icons.xcassets/search24.imageset/search24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/send-filled24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/send-filled24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/send-filled24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/send-filled24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/send-filled24.imageset/send-filled.pdf b/BitwardenResources/Icons.xcassets/send-filled24.imageset/send-filled.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/send-filled24.imageset/send-filled.pdf rename to BitwardenResources/Icons.xcassets/send-filled24.imageset/send-filled.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/share16.imageset/Contents.json b/BitwardenResources/Icons.xcassets/share16.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/share16.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/share16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/share16.imageset/share16.pdf b/BitwardenResources/Icons.xcassets/share16.imageset/share16.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/share16.imageset/share16.pdf rename to BitwardenResources/Icons.xcassets/share16.imageset/share16.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/shield24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/shield24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/shield24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/shield24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/shield24.imageset/shield24.pdf b/BitwardenResources/Icons.xcassets/shield24.imageset/shield24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/shield24.imageset/shield24.pdf rename to BitwardenResources/Icons.xcassets/shield24.imageset/shield24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/square16.imageset/Contents.json b/BitwardenResources/Icons.xcassets/square16.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/square16.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/square16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/square16.imageset/square.pdf b/BitwardenResources/Icons.xcassets/square16.imageset/square.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/square16.imageset/square.pdf rename to BitwardenResources/Icons.xcassets/square16.imageset/square.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/star-filled24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/star-filled24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/star-filled24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/star-filled24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/star-filled24.imageset/star-filled24.pdf b/BitwardenResources/Icons.xcassets/star-filled24.imageset/star-filled24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/star-filled24.imageset/star-filled24.pdf rename to BitwardenResources/Icons.xcassets/star-filled24.imageset/star-filled24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/star24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/star24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/star24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/star24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/star24.imageset/star24.pdf b/BitwardenResources/Icons.xcassets/star24.imageset/star24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/star24.imageset/star24.pdf rename to BitwardenResources/Icons.xcassets/star24.imageset/star24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/sticky-note16.imageset/Contents.json b/BitwardenResources/Icons.xcassets/sticky-note16.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/sticky-note16.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/sticky-note16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/sticky-note16.imageset/sticky-note16.pdf b/BitwardenResources/Icons.xcassets/sticky-note16.imageset/sticky-note16.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/sticky-note16.imageset/sticky-note16.pdf rename to BitwardenResources/Icons.xcassets/sticky-note16.imageset/sticky-note16.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/sticky-note24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/sticky-note24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/sticky-note24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/sticky-note24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/sticky-note24.imageset/sticky-note24.pdf b/BitwardenResources/Icons.xcassets/sticky-note24.imageset/sticky-note24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/sticky-note24.imageset/sticky-note24.pdf rename to BitwardenResources/Icons.xcassets/sticky-note24.imageset/sticky-note24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/trash16.imageset/Contents.json b/BitwardenResources/Icons.xcassets/trash16.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/trash16.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/trash16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/trash16.imageset/trash16.pdf b/BitwardenResources/Icons.xcassets/trash16.imageset/trash16.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/trash16.imageset/trash16.pdf rename to BitwardenResources/Icons.xcassets/trash16.imageset/trash16.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/trash24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/trash24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/trash24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/trash24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/trash24.imageset/trash24.pdf b/BitwardenResources/Icons.xcassets/trash24.imageset/trash24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/trash24.imageset/trash24.pdf rename to BitwardenResources/Icons.xcassets/trash24.imageset/trash24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/unlocked24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/unlocked24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/unlocked24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/unlocked24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/unlocked24.imageset/unlocked24.pdf b/BitwardenResources/Icons.xcassets/unlocked24.imageset/unlocked24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/unlocked24.imageset/unlocked24.pdf rename to BitwardenResources/Icons.xcassets/unlocked24.imageset/unlocked24.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/vault-settings.imageset/Contents.json b/BitwardenResources/Icons.xcassets/vault-settings.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/vault-settings.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/vault-settings.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/vault-settings.imageset/vault-settings-dark.pdf b/BitwardenResources/Icons.xcassets/vault-settings.imageset/vault-settings-dark.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/vault-settings.imageset/vault-settings-dark.pdf rename to BitwardenResources/Icons.xcassets/vault-settings.imageset/vault-settings-dark.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/vault-settings.imageset/vault-settings.pdf b/BitwardenResources/Icons.xcassets/vault-settings.imageset/vault-settings.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/vault-settings.imageset/vault-settings.pdf rename to BitwardenResources/Icons.xcassets/vault-settings.imageset/vault-settings.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/warning16.imageset/Contents.json b/BitwardenResources/Icons.xcassets/warning16.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/warning16.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/warning16.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/warning16.imageset/warning.pdf b/BitwardenResources/Icons.xcassets/warning16.imageset/warning.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/warning16.imageset/warning.pdf rename to BitwardenResources/Icons.xcassets/warning16.imageset/warning.pdf diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/warning24.imageset/Contents.json b/BitwardenResources/Icons.xcassets/warning24.imageset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/warning24.imageset/Contents.json rename to BitwardenResources/Icons.xcassets/warning24.imageset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/warning24.imageset/warning24.pdf b/BitwardenResources/Icons.xcassets/warning24.imageset/warning24.pdf similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/warning24.imageset/warning24.pdf rename to BitwardenResources/Icons.xcassets/warning24.imageset/warning24.pdf diff --git a/BitwardenShareExtension/ShareViewController.swift b/BitwardenShareExtension/ShareViewController.swift index 5420dd3394..b292acea14 100644 --- a/BitwardenShareExtension/ShareViewController.swift +++ b/BitwardenShareExtension/ShareViewController.swift @@ -1,4 +1,5 @@ import BitwardenKit +import BitwardenResources import BitwardenShared import Social import UIKit diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/CompleteRegistrationView.swift b/BitwardenShared/UI/Auth/CompleteRegistration/CompleteRegistrationView.swift index e58c7e2ba5..f68817d296 100644 --- a/BitwardenShared/UI/Auth/CompleteRegistration/CompleteRegistrationView.swift +++ b/BitwardenShared/UI/Auth/CompleteRegistration/CompleteRegistrationView.swift @@ -82,7 +82,7 @@ struct CompleteRegistrationView: View { /// The section where the user can learn more about passwords. private var learnMoreSection: some View { HStack(alignment: .center, spacing: 16) { - Image(decorative: Asset.Images.questionCircle24) + Image(decorative: SharedAsset.Icons.questionCircle24) .foregroundStyle(SharedAsset.Colors.iconSecondary.swiftUIColor) VStack(alignment: .leading, spacing: 0) { diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/MasterPasswordGenerator/MasterPasswordGeneratorView.swift b/BitwardenShared/UI/Auth/CompleteRegistration/MasterPasswordGenerator/MasterPasswordGeneratorView.swift index 268f7400d4..eceb818ba3 100644 --- a/BitwardenShared/UI/Auth/CompleteRegistration/MasterPasswordGenerator/MasterPasswordGeneratorView.swift +++ b/BitwardenShared/UI/Auth/CompleteRegistration/MasterPasswordGenerator/MasterPasswordGeneratorView.swift @@ -62,7 +62,7 @@ struct MasterPasswordGeneratorView: View { await store.perform(.generate) } label: { HStack(spacing: 8) { - Image(decorative: Asset.Images.generate16) + Image(decorative: SharedAsset.Icons.generate16) Text(Localizations.generate) } diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/PreventAccountLock/PreventAccountLockView.swift b/BitwardenShared/UI/Auth/CompleteRegistration/PreventAccountLock/PreventAccountLockView.swift index 3ce2b1ad65..791b13ea6b 100644 --- a/BitwardenShared/UI/Auth/CompleteRegistration/PreventAccountLock/PreventAccountLockView.swift +++ b/BitwardenShared/UI/Auth/CompleteRegistration/PreventAccountLock/PreventAccountLockView.swift @@ -20,13 +20,13 @@ struct PreventAccountLockView: View { ContentBlock(dividerLeadingPadding: 48) { rowView( - image: Asset.Images.lightbulb24, + image: SharedAsset.Icons.lightbulb24, title: Localizations.createAHint, subtitle: Localizations.yourHintWillBeSentToYouViaEmailWhenYouRequestIt ) rowView( - image: Asset.Images.pencil24, + image: SharedAsset.Icons.pencil24, title: Localizations.writeYourPasswordDown, subtitle: Localizations.beCarefulToKeepYourWrittenPasswordSomewhereSecretAndSafe ) @@ -68,7 +68,7 @@ struct PreventAccountLockView: View { /// @ViewBuilder private func rowView( - image: ImageAsset, + image: SharedImageAsset, title: String, subtitle: String? = nil ) -> some View { diff --git a/BitwardenShared/UI/Auth/Landing/LandingView.swift b/BitwardenShared/UI/Auth/Landing/LandingView.swift index b3859dba6a..aba790f7f1 100644 --- a/BitwardenShared/UI/Auth/Landing/LandingView.swift +++ b/BitwardenShared/UI/Auth/Landing/LandingView.swift @@ -158,7 +158,7 @@ struct LandingView: View { Button { store.send(.showPreLoginSettings) } label: { - Label(Localizations.appSettings, image: Asset.Images.cog16.swiftUIImage) + Label(Localizations.appSettings, image: SharedAsset.Icons.cog16.swiftUIImage) } .buttonStyle(.bitwardenBorderless) .frame(maxWidth: .infinity, alignment: .center) diff --git a/BitwardenShared/UI/Auth/Login/LoginView.swift b/BitwardenShared/UI/Auth/Login/LoginView.swift index 22ceb45733..ea8c9ccb4c 100644 --- a/BitwardenShared/UI/Auth/Login/LoginView.swift +++ b/BitwardenShared/UI/Auth/Login/LoginView.swift @@ -88,7 +88,7 @@ struct LoginView: View { store.send(.loginWithDevicePressed) } label: { HStack(spacing: 8) { - Image(decorative: Asset.Images.mobile16) + Image(decorative: SharedAsset.Icons.mobile16) .imageStyle(.accessoryIcon16(scaleWithFont: true)) Text(Localizations.logInWithDevice) } @@ -101,7 +101,7 @@ struct LoginView: View { store.send(.enterpriseSingleSignOnPressed) } label: { HStack(spacing: 8) { - Image(decorative: Asset.Images.provider16) + Image(decorative: SharedAsset.Icons.provider16) .imageStyle(.accessoryIcon16(scaleWithFont: true)) Text(Localizations.logInSso) } diff --git a/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherRow.swift b/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherRow.swift index 6e2647bbd5..18af46fa92 100644 --- a/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherRow.swift +++ b/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherRow.swift @@ -114,7 +114,7 @@ struct ProfileSwitcherRow: View { ) .accessibilityLabel(Localizations.account) case .addAccount: - Asset.Images.plus16.swiftUIImage + SharedAsset.Icons.plus16.swiftUIImage .imageStyle(.accessoryIcon16(color: SharedAsset.Colors.iconSecondary.swiftUIColor)) .padding(4) } @@ -169,12 +169,12 @@ struct ProfileSwitcherRow: View { private var trailingIcon: Image? { switch store.state.rowType { case .active: - return Asset.Images.checkCircle24.swiftUIImage + return SharedAsset.Icons.checkCircle24.swiftUIImage case let .alternate(account): if account.isUnlocked { - return Asset.Images.unlocked24.swiftUIImage + return SharedAsset.Icons.unlocked24.swiftUIImage } else { - return Asset.Images.locked24.swiftUIImage + return SharedAsset.Icons.locked24.swiftUIImage } case .addAccount: return nil diff --git a/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherSheet.swift b/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherSheet.swift index 07c806f449..e0d877a484 100644 --- a/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherSheet.swift +++ b/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherSheet.swift @@ -40,7 +40,7 @@ public struct ProfileSwitcherSheet: View { AsyncButton { await store.perform(.addAccountPressed) } label: { - Label(Localizations.addAccount, image: Asset.Images.plus16.swiftUIImage) + Label(Localizations.addAccount, image: SharedAsset.Icons.plus16.swiftUIImage) } .buttonStyle(.bitwardenBorderless) .frame(maxWidth: .infinity, alignment: .center) diff --git a/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherToolbarView.swift b/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherToolbarView.swift index 7ae3628d4f..14b8332fb3 100644 --- a/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherToolbarView.swift +++ b/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherToolbarView.swift @@ -73,7 +73,7 @@ extension View { .frame(minWidth: 22, alignment: .center) .background { if initials == nil { - Asset.Images.horizontalDots16.swiftUIImage + SharedAsset.Icons.horizontalDots16.swiftUIImage .padding(.vertical, 10) .padding(.horizontal, 14) .opacity(initials == nil ? 1.0 : 0.0) diff --git a/BitwardenShared/UI/Platform/Application/Appearance/Styles/AccessoryButtonStyle.swift b/BitwardenShared/UI/Platform/Application/Appearance/Styles/AccessoryButtonStyle.swift index 774d37891b..4081124fcb 100644 --- a/BitwardenShared/UI/Platform/Application/Appearance/Styles/AccessoryButtonStyle.swift +++ b/BitwardenShared/UI/Platform/Application/Appearance/Styles/AccessoryButtonStyle.swift @@ -37,14 +37,14 @@ extension ButtonStyle where Self == AccessoryButtonStyle { #if DEBUG #Preview("Enabled") { Button {} label: { - Asset.Images.copy24.swiftUIImage + SharedAsset.Icons.copy24.swiftUIImage } .buttonStyle(.accessory) } #Preview("Disabled") { Button {} label: { - Asset.Images.copy24.swiftUIImage + SharedAsset.Icons.copy24.swiftUIImage } .buttonStyle(.accessory) .disabled(true) diff --git a/BitwardenShared/UI/Platform/Application/Appearance/Styles/ButtonStylesTests.swift b/BitwardenShared/UI/Platform/Application/Appearance/Styles/ButtonStylesTests.swift index 56d5b0d91d..2408dbe46a 100644 --- a/BitwardenShared/UI/Platform/Application/Appearance/Styles/ButtonStylesTests.swift +++ b/BitwardenShared/UI/Platform/Application/Appearance/Styles/ButtonStylesTests.swift @@ -57,10 +57,10 @@ final class ButtonStylesTests: BitwardenTestCase { titleView("Field Label Icon") Button {} label: { - Label("Options", image: Asset.Images.cog16.swiftUIImage) + Label("Options", image: SharedAsset.Icons.cog16.swiftUIImage) } Button {} label: { - Label("Options", image: Asset.Images.cog16.swiftUIImage) + Label("Options", image: SharedAsset.Icons.cog16.swiftUIImage) } .disabled(true) } @@ -70,10 +70,10 @@ final class ButtonStylesTests: BitwardenTestCase { titleView("Circle (FAB)") Button {} label: { - Asset.Images.cog24.swiftUIImage + SharedAsset.Icons.cog24.swiftUIImage } Button {} label: { - Asset.Images.cog24.swiftUIImage + SharedAsset.Icons.cog24.swiftUIImage } .disabled(true) } diff --git a/BitwardenShared/UI/Platform/Application/Appearance/Styles/CircleButtonStyle.swift b/BitwardenShared/UI/Platform/Application/Appearance/Styles/CircleButtonStyle.swift index 02caf89bb1..2815e39cac 100644 --- a/BitwardenShared/UI/Platform/Application/Appearance/Styles/CircleButtonStyle.swift +++ b/BitwardenShared/UI/Platform/Application/Appearance/Styles/CircleButtonStyle.swift @@ -44,7 +44,7 @@ struct CircleButtonStyle: ButtonStyle { #Preview { VStack { Button {} label: { - Asset.Images.plus32.swiftUIImage + SharedAsset.Icons.plus32.swiftUIImage .imageStyle( .init( color: SharedAsset.Colors.buttonFilledForeground.swiftUIColor, diff --git a/BitwardenShared/UI/Platform/Application/Appearance/Styles/CircleMenuStyle.swift b/BitwardenShared/UI/Platform/Application/Appearance/Styles/CircleMenuStyle.swift index 58f521572a..f2769e1464 100644 --- a/BitwardenShared/UI/Platform/Application/Appearance/Styles/CircleMenuStyle.swift +++ b/BitwardenShared/UI/Platform/Application/Appearance/Styles/CircleMenuStyle.swift @@ -49,7 +49,7 @@ struct CircleMenuStyle: MenuStyle { Button("First") {} Button("Second") {} } label: { - Asset.Images.plus32.swiftUIImage + SharedAsset.Icons.plus32.swiftUIImage } .menuStyle(CircleMenuStyle(diameter: 50)) } diff --git a/BitwardenShared/UI/Platform/Application/Appearance/Styles/FieldLabelIconButtonStyle.swift b/BitwardenShared/UI/Platform/Application/Appearance/Styles/FieldLabelIconButtonStyle.swift index aeb6fac823..283aeaab91 100644 --- a/BitwardenShared/UI/Platform/Application/Appearance/Styles/FieldLabelIconButtonStyle.swift +++ b/BitwardenShared/UI/Platform/Application/Appearance/Styles/FieldLabelIconButtonStyle.swift @@ -45,11 +45,11 @@ extension ButtonStyle where Self == FieldLabelIconButtonStyle { #Preview() { VStack { Button {} label: { - Asset.Images.cog16.swiftUIImage + SharedAsset.Icons.cog16.swiftUIImage } Button {} label: { - Asset.Images.cog16.swiftUIImage + SharedAsset.Icons.cog16.swiftUIImage } .disabled(true) } diff --git a/BitwardenShared/UI/Platform/Application/Appearance/Styles/PrimaryMenuStyle.swift b/BitwardenShared/UI/Platform/Application/Appearance/Styles/PrimaryMenuStyle.swift index 6358b6b544..d8e235ab10 100644 --- a/BitwardenShared/UI/Platform/Application/Appearance/Styles/PrimaryMenuStyle.swift +++ b/BitwardenShared/UI/Platform/Application/Appearance/Styles/PrimaryMenuStyle.swift @@ -76,7 +76,7 @@ extension MenuStyle where Self == PrimaryMenuStyle { Button("First") {} Button("Second") {} } label: { - Asset.Images.plus32.swiftUIImage + SharedAsset.Icons.plus32.swiftUIImage } .menuStyle(.primary()) } diff --git a/BitwardenShared/UI/Platform/Application/Appearance/UI.swift b/BitwardenShared/UI/Platform/Application/Appearance/UI.swift index cb6bc913f9..cc2009abca 100644 --- a/BitwardenShared/UI/Platform/Application/Appearance/UI.swift +++ b/BitwardenShared/UI/Platform/Application/Appearance/UI.swift @@ -129,10 +129,10 @@ public enum UI { UISearchBar.appearance().tintColor = SharedAsset.Colors.textInteraction.color // Explicitly tint the image so that it does not assume the tint color assigned to the entire search bar. - let image = Asset.Images.circleX16.image + let image = SharedAsset.Icons.circleX16.image let tintedImage = image.withTintColor(SharedAsset.Colors.textSecondary.color, renderingMode: .alwaysOriginal) UISearchBar.appearance().setImage(tintedImage, for: .clear, state: .normal) - UISearchBar.appearance().setImage(Asset.Images.search16.image, for: .search, state: .normal) + UISearchBar.appearance().setImage(SharedAsset.Icons.search16.image, for: .search, state: .normal) // Adjust the appearance of `UITextView` for `BitwardenUITextField` instances on iOS 15. UITextView.appearance().isScrollEnabled = false diff --git a/BitwardenShared/UI/Platform/Application/Extensions/View+Toolbar.swift b/BitwardenShared/UI/Platform/Application/Extensions/View+Toolbar.swift index 4e600e1ec7..575afbe00c 100644 --- a/BitwardenShared/UI/Platform/Application/Extensions/View+Toolbar.swift +++ b/BitwardenShared/UI/Platform/Application/Extensions/View+Toolbar.swift @@ -173,7 +173,7 @@ extension View { Menu { content() } label: { - Image(asset: Asset.Images.ellipsisVertical24, label: Text(Localizations.options)) + Image(asset: SharedAsset.Icons.ellipsisVertical24, label: Text(Localizations.options)) .imageStyle(.toolbarIcon) .accessibilityIdentifier("HeaderBarOptionsButton") } diff --git a/BitwardenShared/UI/Platform/Application/Extensions/View.swift b/BitwardenShared/UI/Platform/Application/Extensions/View.swift index 7702820e59..5bca90a859 100644 --- a/BitwardenShared/UI/Platform/Application/Extensions/View.swift +++ b/BitwardenShared/UI/Platform/Application/Extensions/View.swift @@ -64,7 +64,7 @@ extension View { ) -> some View { floatingActionButton( hidden: hidden, - image: Asset.Images.plus32.swiftUIImage, + image: SharedAsset.Icons.plus32.swiftUIImage, action: action ) .accessibilityLabel(Localizations.add) @@ -83,7 +83,7 @@ extension View { hidden: Bool = false, action: @escaping (SendType) async -> Void ) -> some View { - FloatingActionMenu(image: Asset.Images.plus32.swiftUIImage) { + FloatingActionMenu(image: SharedAsset.Icons.plus32.swiftUIImage) { ForEach(SendType.allCases) { type in AsyncButton(type.localizedName) { await action(type) @@ -110,7 +110,7 @@ extension View { addItem: @escaping (CipherType) -> Void, addFolder: (() -> Void)? = nil ) -> some View { - FloatingActionMenu(image: Asset.Images.plus32.swiftUIImage) { + FloatingActionMenu(image: SharedAsset.Icons.plus32.swiftUIImage) { // The items in the menu are added in reverse order so that when the context menu // displays above the button, which is the common case, the types are at the top with // folder at the bottom. @@ -145,7 +145,7 @@ extension View { ) -> some View { floatingActionButton( hidden: hidden, - image: Asset.Images.pencil32.swiftUIImage, + image: SharedAsset.Icons.pencil32.swiftUIImage, action: action ) .accessibilityLabel(Localizations.edit) diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Contents.json deleted file mode 100644 index 73c00596a7..0000000000 --- a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/camera16.imageset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/camera16.imageset/Contents.json deleted file mode 100644 index 13d9dc55fa..0000000000 --- a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/camera16.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "camera.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/check16.imageset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/check16.imageset/Contents.json deleted file mode 100644 index 215a87546d..0000000000 --- a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/check16.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "check.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/gear-filled24.imageset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/gear-filled24.imageset/Contents.json deleted file mode 100644 index 7c14220536..0000000000 --- a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/gear-filled24.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "gear-filled.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/locked-filled24.imageset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/locked-filled24.imageset/Contents.json deleted file mode 100644 index 0bca671f76..0000000000 --- a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/locked-filled24.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "locked-filled.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/paperclip16.imageset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/paperclip16.imageset/Contents.json deleted file mode 100644 index facec867d6..0000000000 --- a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/paperclip16.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "paperclip.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/plus16.imageset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/plus16.imageset/Contents.json deleted file mode 100644 index 797f6df0e8..0000000000 --- a/BitwardenShared/UI/Platform/Application/Support/Images.xcassets/Icons/plus16.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "plus.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/BitwardenShared/UI/Platform/Application/Views/AccessoryButton.swift b/BitwardenShared/UI/Platform/Application/Views/AccessoryButton.swift index db74d9d24d..c60115b729 100644 --- a/BitwardenShared/UI/Platform/Application/Views/AccessoryButton.swift +++ b/BitwardenShared/UI/Platform/Application/Views/AccessoryButton.swift @@ -29,7 +29,7 @@ struct AccessoryButton: View { var action: Action /// The image to display in the button. - var asset: ImageAsset + var asset: SharedImageAsset var body: some View { switch action { @@ -64,7 +64,7 @@ struct AccessoryButton: View { /// - accessibilityLabel: The accessibility label of the button. /// - action: The action to perform when the user triggers the button. /// - init(asset: ImageAsset, + init(asset: SharedImageAsset, accessibilityLabel: String, accessibilityIdentifier: String = "", action: @escaping () -> Void) { @@ -83,7 +83,7 @@ struct AccessoryButton: View { /// - accessibilityIdentifier: The accessibility identifier of the button. /// - action: The action to perform when the user triggers the button. /// - init(asset: ImageAsset, + init(asset: SharedImageAsset, accessibilityLabel: String, accessibilityIdentifier: String = "", action: @escaping () async -> Void) { @@ -97,5 +97,5 @@ struct AccessoryButton: View { // MARK: Previews #Preview { - AccessoryButton(asset: Asset.Images.copy24, accessibilityLabel: Localizations.copy) {} + AccessoryButton(asset: SharedAsset.Icons.copy24, accessibilityLabel: Localizations.copy) {} } diff --git a/BitwardenShared/UI/Platform/Application/Views/ActionCard.swift b/BitwardenShared/UI/Platform/Application/Views/ActionCard.swift index e9061ff127..74debb3870 100644 --- a/BitwardenShared/UI/Platform/Application/Views/ActionCard.swift +++ b/BitwardenShared/UI/Platform/Application/Views/ActionCard.swift @@ -74,7 +74,7 @@ struct ActionCard: View { if let dismissButtonState { AsyncButton(action: dismissButtonState.action) { - Image(asset: Asset.Images.close16, label: Text(dismissButtonState.title)) + Image(asset: SharedAsset.Icons.close16, label: Text(dismissButtonState.title)) .imageStyle(.accessoryIcon16(color: SharedAsset.Colors.iconPrimary.swiftUIColor)) .padding(16) // Add padding to increase tappable area... } @@ -167,7 +167,7 @@ struct ActionCard: View { title: "Title", message: "Message" ) { - Asset.Images.warning24.swiftUIImage + SharedAsset.Icons.warning24.swiftUIImage } ActionCard( diff --git a/BitwardenShared/UI/Platform/Application/Views/BitwardenFloatingTextLabel.swift b/BitwardenShared/UI/Platform/Application/Views/BitwardenFloatingTextLabel.swift index 5883337547..07f9dab3d8 100644 --- a/BitwardenShared/UI/Platform/Application/Views/BitwardenFloatingTextLabel.swift +++ b/BitwardenShared/UI/Platform/Application/Views/BitwardenFloatingTextLabel.swift @@ -151,7 +151,7 @@ struct BitwardenFloatingTextLabel: View { BitwardenFloatingTextLabel(title: "Title", showPlaceholder: false) { TextField("", text: .constant("Value")) } trailingContent: { - Asset.Images.cog24.swiftUIImage + SharedAsset.Icons.cog24.swiftUIImage .foregroundStyle(SharedAsset.Colors.iconPrimary.swiftUIColor) } } diff --git a/BitwardenShared/UI/Platform/Application/Views/BitwardenMenuField.swift b/BitwardenShared/UI/Platform/Application/Views/BitwardenMenuField.swift index 0a51de2f83..da008a1c9f 100644 --- a/BitwardenShared/UI/Platform/Application/Views/BitwardenMenuField.swift +++ b/BitwardenShared/UI/Platform/Application/Views/BitwardenMenuField.swift @@ -135,7 +135,7 @@ struct BitwardenMenuField< if let trailingContent { trailingContent } else { - Asset.Images.chevronDown24.swiftUIImage + SharedAsset.Icons.chevronDown24.swiftUIImage .imageStyle(.rowIcon) } } @@ -400,7 +400,7 @@ private enum MenuPreviewOptions: CaseIterable, Menuable { selection: .constant(.dog), trailingContent: { Button {} label: { - Asset.Images.camera16.swiftUIImage + SharedAsset.Icons.camera16.swiftUIImage } .buttonStyle(.accessory) } diff --git a/BitwardenShared/UI/Platform/Application/Views/BitwardenStepper.swift b/BitwardenShared/UI/Platform/Application/Views/BitwardenStepper.swift index 87ca2e0f6c..a26e9db9d7 100644 --- a/BitwardenShared/UI/Platform/Application/Views/BitwardenStepper.swift +++ b/BitwardenShared/UI/Platform/Application/Views/BitwardenStepper.swift @@ -139,7 +139,7 @@ struct BitwardenStepper: View { Button { value -= 1 } label: { - Asset.Images.minus16.swiftUIImage + SharedAsset.Icons.minus16.swiftUIImage } .buttonStyle(CircleButtonStyle(diameter: 30)) .disabled(value <= range.lowerBound) @@ -159,7 +159,7 @@ struct BitwardenStepper: View { Button { value += 1 } label: { - Asset.Images.plus16.swiftUIImage + SharedAsset.Icons.plus16.swiftUIImage } .buttonStyle(CircleButtonStyle(diameter: 30)) .disabled(value >= range.upperBound) diff --git a/BitwardenShared/UI/Platform/Application/Views/BitwardenTextField.swift b/BitwardenShared/UI/Platform/Application/Views/BitwardenTextField.swift index 9b0a9952c4..7cb19a56ae 100644 --- a/BitwardenShared/UI/Platform/Application/Views/BitwardenTextField.swift +++ b/BitwardenShared/UI/Platform/Application/Views/BitwardenTextField.swift @@ -108,8 +108,8 @@ struct BitwardenTextField: View { if let isPasswordVisible, canViewPassword { AccessoryButton( asset: isPasswordVisible.wrappedValue - ? Asset.Images.eyeSlash24 - : Asset.Images.eye24, + ? SharedAsset.Icons.eyeSlash24 + : SharedAsset.Icons.eye24, accessibilityLabel: isPasswordVisible.wrappedValue ? Localizations.passwordIsVisibleTapToHide : Localizations.passwordIsNotVisibleTapToShow @@ -407,7 +407,7 @@ extension BitwardenTextField where FooterContent == EmptyView, TrailingContent = title: "Title", text: .constant("Text field text") ) { - AccessoryButton(asset: Asset.Images.cog24, accessibilityLabel: "") {} + AccessoryButton(asset: SharedAsset.Icons.cog24, accessibilityLabel: "") {} } .padding() } @@ -422,7 +422,7 @@ extension BitwardenTextField where FooterContent == EmptyView, TrailingContent = footer: Localizations.vaultLockedMasterPassword, isPasswordVisible: .constant(false) ) { - AccessoryButton(asset: Asset.Images.cog24, accessibilityLabel: "") {} + AccessoryButton(asset: SharedAsset.Icons.cog24, accessibilityLabel: "") {} } .padding() } @@ -436,7 +436,7 @@ extension BitwardenTextField where FooterContent == EmptyView, TrailingContent = text: .constant("Text field text"), isPasswordVisible: .constant(false) ) { - AccessoryButton(asset: Asset.Images.cog24, accessibilityLabel: "") {} + AccessoryButton(asset: SharedAsset.Icons.cog24, accessibilityLabel: "") {} } footerContent: { Button("Footer button") {} .buttonStyle(.bitwardenBorderless) diff --git a/BitwardenShared/UI/Platform/Application/Views/BitwardenTextValueField.swift b/BitwardenShared/UI/Platform/Application/Views/BitwardenTextValueField.swift index 607e800831..392de90813 100644 --- a/BitwardenShared/UI/Platform/Application/Views/BitwardenTextValueField.swift +++ b/BitwardenShared/UI/Platform/Application/Views/BitwardenTextValueField.swift @@ -178,7 +178,7 @@ extension BitwardenTextValueField where AccessoryContent == AccessoryButton { useUIKitTextView: useUIKitTextView, accessoryContent: { AccessoryButton( - asset: Asset.Images.copy24, + asset: SharedAsset.Icons.copy24, accessibilityLabel: Localizations.copy, accessibilityIdentifier: copyButtonAccessibilityIdentifier, action: copyButtonAction diff --git a/BitwardenShared/UI/Platform/Application/Views/BitwardenToggle.swift b/BitwardenShared/UI/Platform/Application/Views/BitwardenToggle.swift index 54f5edbf2c..41e75d834b 100644 --- a/BitwardenShared/UI/Platform/Application/Views/BitwardenToggle.swift +++ b/BitwardenShared/UI/Platform/Application/Views/BitwardenToggle.swift @@ -164,7 +164,7 @@ struct BitwardenToggle: View { Text("Toggle") Button {} label: { - Asset.Images.cog16.swiftUIImage + SharedAsset.Icons.cog16.swiftUIImage } .buttonStyle(.fieldLabelIcon) } diff --git a/BitwardenShared/UI/Platform/Application/Views/ExpandableContent.swift b/BitwardenShared/UI/Platform/Application/Views/ExpandableContent.swift index dc331066be..94af0d81ca 100644 --- a/BitwardenShared/UI/Platform/Application/Views/ExpandableContent.swift +++ b/BitwardenShared/UI/Platform/Application/Views/ExpandableContent.swift @@ -48,7 +48,7 @@ struct ExpandableContent: View { Text(title) .styleGuide(.callout, weight: .semibold) - Asset.Images.chevronDown16.swiftUIImage + SharedAsset.Icons.chevronDown16.swiftUIImage .imageStyle(.accessoryIcon16(scaleWithFont: true)) .rotationEffect(isExpanded ? Angle(degrees: 180) : .zero) } diff --git a/BitwardenShared/UI/Platform/Application/Views/FloatingActionButton.swift b/BitwardenShared/UI/Platform/Application/Views/FloatingActionButton.swift index 712656c174..acf08a6aa3 100644 --- a/BitwardenShared/UI/Platform/Application/Views/FloatingActionButton.swift +++ b/BitwardenShared/UI/Platform/Application/Views/FloatingActionButton.swift @@ -1,4 +1,5 @@ import BitwardenKit +import BitwardenResources import SwiftUI // MARK: - FloatingActionButton @@ -33,7 +34,7 @@ struct FloatingActionButton: View { #Preview { VStack { FloatingActionButton( - image: Asset.Images.pencil32.swiftUIImage) {} + image: SharedAsset.Icons.pencil32.swiftUIImage) {} } .padding() } diff --git a/BitwardenShared/UI/Platform/Application/Views/FloatingActionMenu.swift b/BitwardenShared/UI/Platform/Application/Views/FloatingActionMenu.swift index d08ec1f4cc..4e6674bd3f 100644 --- a/BitwardenShared/UI/Platform/Application/Views/FloatingActionMenu.swift +++ b/BitwardenShared/UI/Platform/Application/Views/FloatingActionMenu.swift @@ -1,3 +1,4 @@ +import BitwardenResources import SwiftUI // MARK: - FloatingActionMenu @@ -53,7 +54,7 @@ struct FloatingActionMenu: View { #if DEBUG #Preview { VStack { - FloatingActionMenu(image: Asset.Images.plus32.swiftUIImage) { + FloatingActionMenu(image: SharedAsset.Icons.plus32.swiftUIImage) { Button("Item 1") {} Button("Item 2") {} Button("Item 3") {} diff --git a/BitwardenShared/UI/Platform/Application/Views/GuidedTourView/GuidedTourView.swift b/BitwardenShared/UI/Platform/Application/Views/GuidedTourView/GuidedTourView.swift index c4642c2dbf..d27fd83812 100644 --- a/BitwardenShared/UI/Platform/Application/Views/GuidedTourView/GuidedTourView.swift +++ b/BitwardenShared/UI/Platform/Application/Views/GuidedTourView/GuidedTourView.swift @@ -86,7 +86,7 @@ struct GuidedTourView: View { @ViewBuilder private var arrowView: some View { let coachMarkVerticalPosition = calculateCoachMarkPosition() let shouldRotateArrow = coachMarkVerticalPosition == .top - Image(asset: Asset.Images.arrowUp) + Image(asset: SharedAsset.Icons.arrowUp) .opacity(isArrowVisible ? 1 : 0) .rotationEffect(.degrees(shouldRotateArrow ? 180 : 0)) .animation(.smooth(duration: animationDuration), value: shouldRotateArrow) @@ -136,7 +136,7 @@ struct GuidedTourView: View { Button { store.send(.dismissTapped) } label: { - Image(asset: Asset.Images.close16, label: Text(Localizations.dismiss)) + Image(asset: SharedAsset.Icons.close16, label: Text(Localizations.dismiss)) .imageStyle(.accessoryIcon16(color: SharedAsset.Colors.iconPrimary.swiftUIColor)) } } diff --git a/BitwardenShared/UI/Platform/Application/Views/IllustratedMessageView.swift b/BitwardenShared/UI/Platform/Application/Views/IllustratedMessageView.swift index a69c6a85a1..3c61e042c1 100644 --- a/BitwardenShared/UI/Platform/Application/Views/IllustratedMessageView.swift +++ b/BitwardenShared/UI/Platform/Application/Views/IllustratedMessageView.swift @@ -109,6 +109,29 @@ struct IllustratedMessageView: View { self.title = title } + /// Initialize a `IllustratedMessageView`. + /// + /// - Parameters: + /// - image: The image asset to display. + /// - style: The style of the message view. + /// - title: The title to display. + /// - message: The message to display. + /// - accessory: An optional accessory view to display. + /// + init( + image: SharedImageAsset, + style: IllustratedMessageStyle = .smallImage, + title: String? = nil, + message: String, + @ViewBuilder accessory: () -> Accessory + ) { + self.accessory = accessory() + self.image = image.swiftUIImage + self.message = message + self.style = style + self.title = title + } + // MARK: Private /// A dynamic stack view that lays out content vertically when in a regular vertical size class @@ -166,6 +189,27 @@ extension IllustratedMessageView where Accessory == EmptyView { self.style = style self.title = title } + + /// Initialize a `IllustratedMessageView`. + /// + /// - Parameters: + /// - image: The image asset to display. + /// - style: The style of the message view. + /// - title: The title to display. + /// - message: The message to display. + /// + init( + image: SharedImageAsset, + style: IllustratedMessageStyle = .smallImage, + title: String? = nil, + message: String + ) { + accessory = nil + self.image = image.swiftUIImage + self.message = message + self.style = style + self.title = title + } } // MARK: - Previews @@ -206,7 +250,7 @@ extension IllustratedMessageView where Accessory == EmptyView { #Preview("LargeTextTintedIcon") { IllustratedMessageView( - image: Asset.Images.plus24, + image: SharedAsset.Icons.plus24, style: .largeTextTintedIcon, title: Localizations.setUpUnlock, message: Localizations.setUpBiometricsOrChooseAPinCodeToQuicklyAccessYourVaultAndAutofillYourLogins diff --git a/BitwardenShared/UI/Platform/Application/Views/IllustratedMessageViewTests.swift b/BitwardenShared/UI/Platform/Application/Views/IllustratedMessageViewTests.swift index 4c21cb8447..41791c9e3f 100644 --- a/BitwardenShared/UI/Platform/Application/Views/IllustratedMessageViewTests.swift +++ b/BitwardenShared/UI/Platform/Application/Views/IllustratedMessageViewTests.swift @@ -35,7 +35,7 @@ class IllustratedMessageViewTests: BitwardenTestCase { /// Test snapshots of the largeTextTintedIcon style. func disabletest_snapshot_largeTextTintedIcon() { let subject = IllustratedMessageView( - image: Asset.Images.plus24, + image: SharedAsset.Icons.plus24, style: .largeTextTintedIcon, title: Localizations.importPasswords, message: Localizations.startImportCXFDescriptionLong diff --git a/BitwardenShared/UI/Platform/Application/Views/PasswordStrengthIndicator.swift b/BitwardenShared/UI/Platform/Application/Views/PasswordStrengthIndicator.swift index 1a86bb12ef..956c0fed65 100644 --- a/BitwardenShared/UI/Platform/Application/Views/PasswordStrengthIndicator.swift +++ b/BitwardenShared/UI/Platform/Application/Views/PasswordStrengthIndicator.swift @@ -37,7 +37,7 @@ struct PasswordStrengthIndicator: View { HStack { HStack(spacing: 4) { if passwordTextCount >= requiredTextCount { - Image(asset: Asset.Images.check12) + Image(asset: SharedAsset.Icons.check12) .foregroundColor(SharedAsset.Colors.textSecondary.swiftUIColor) .padding(.leading, 1) } else { diff --git a/BitwardenShared/UI/Platform/Application/Views/PasswordVisibilityButton.swift b/BitwardenShared/UI/Platform/Application/Views/PasswordVisibilityButton.swift index 5d22a7d568..e6eefbe921 100644 --- a/BitwardenShared/UI/Platform/Application/Views/PasswordVisibilityButton.swift +++ b/BitwardenShared/UI/Platform/Application/Views/PasswordVisibilityButton.swift @@ -26,8 +26,8 @@ struct PasswordVisibilityButton: View { Button(action: action) { ( isPasswordVisible - ? Asset.Images.eyeSlash24.swiftUIImage - : Asset.Images.eye24.swiftUIImage + ? SharedAsset.Icons.eyeSlash24.swiftUIImage + : SharedAsset.Icons.eye24.swiftUIImage ) .resizable() .frame(width: size, height: size) diff --git a/BitwardenShared/UI/Platform/Application/Views/RegionSelector.swift b/BitwardenShared/UI/Platform/Application/Views/RegionSelector.swift index bedf232552..091bec7361 100644 --- a/BitwardenShared/UI/Platform/Application/Views/RegionSelector.swift +++ b/BitwardenShared/UI/Platform/Application/Views/RegionSelector.swift @@ -31,7 +31,7 @@ struct RegionSelector: View { .styleGuide(.footnote) .multilineTextAlignment(.leading) - Image(decorative: Asset.Images.chevronDown16) + Image(decorative: SharedAsset.Icons.chevronDown16) .scaledFrame(width: 12, height: 12) .foregroundColor(SharedAsset.Colors.iconSecondary.swiftUIColor) } diff --git a/BitwardenShared/UI/Platform/Application/Views/SearchNoResultsView.swift b/BitwardenShared/UI/Platform/Application/Views/SearchNoResultsView.swift index 2651d59dc3..d135e9bec3 100644 --- a/BitwardenShared/UI/Platform/Application/Views/SearchNoResultsView.swift +++ b/BitwardenShared/UI/Platform/Application/Views/SearchNoResultsView.swift @@ -22,7 +22,7 @@ struct SearchNoResultsView: View { } VStack(spacing: 35) { - Image(decorative: Asset.Images.search24) + Image(decorative: SharedAsset.Icons.search24) .resizable() .frame(width: 74, height: 74) .foregroundColor(SharedAsset.Colors.textSecondary.swiftUIColor) diff --git a/BitwardenShared/UI/Platform/Application/Views/ToastBannerView.swift b/BitwardenShared/UI/Platform/Application/Views/ToastBannerView.swift index 2d3d4bdd35..e2bfc796ca 100644 --- a/BitwardenShared/UI/Platform/Application/Views/ToastBannerView.swift +++ b/BitwardenShared/UI/Platform/Application/Views/ToastBannerView.swift @@ -45,7 +45,7 @@ struct ToastBannerView: View { Button { isVisible = false } label: { - Image(asset: Asset.Images.close16, label: Text(Localizations.close)) + Image(asset: SharedAsset.Icons.close16, label: Text(Localizations.close)) .imageStyle(.accessoryIcon16(color: SharedAsset.Colors.iconReversed.swiftUIColor)) .padding(16) // Add padding to increase tappable area... } diff --git a/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/ExtensionActivationView.swift b/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/ExtensionActivationView.swift index ca89a707e7..203a298e46 100644 --- a/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/ExtensionActivationView.swift +++ b/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/ExtensionActivationView.swift @@ -86,7 +86,7 @@ struct ExtensionActivationView: View { @ViewBuilder private var image: some View { switch store.state.extensionType { case .appExtension: - Image(decorative: Asset.Images.shield24) + Image(decorative: SharedAsset.Icons.shield24) .resizable() .frame(width: 70, height: 70) .padding(16) @@ -95,7 +95,7 @@ struct ExtensionActivationView: View { .strokeBorder(SharedAsset.Colors.strokeDivider.swiftUIColor, lineWidth: 1.5) } case .autofillExtension: - Image(decorative: Asset.Images.check24) + Image(decorative: SharedAsset.Icons.check24) .resizable() .frame(width: 100, height: 100) .foregroundStyle(.green) diff --git a/BitwardenShared/UI/Platform/Settings/Settings/About/AboutView.swift b/BitwardenShared/UI/Platform/Settings/Settings/About/AboutView.swift index 0968f91df2..012df79c2f 100644 --- a/BitwardenShared/UI/Platform/Settings/Settings/About/AboutView.swift +++ b/BitwardenShared/UI/Platform/Settings/Settings/About/AboutView.swift @@ -78,7 +78,7 @@ struct AboutView: View { Button { openURL(ExternalLinksConstants.flightRecorderHelp) } label: { - Asset.Images.questionCircle16.swiftUIImage + SharedAsset.Icons.questionCircle16.swiftUIImage .scaledFrame(width: 16, height: 16) .accessibilityLabel(Localizations.learnMore) } @@ -113,7 +113,7 @@ struct AboutView: View { SettingsListItem(store.state.version) { store.send(.versionTapped) } trailingContent: { - Asset.Images.copy24.swiftUIImage + SharedAsset.Icons.copy24.swiftUIImage .imageStyle(.rowIcon) } } @@ -144,7 +144,7 @@ struct AboutView: View { SettingsListItem(name) { store.send(action) } trailingContent: { - Asset.Images.externalLink24.swiftUIImage + SharedAsset.Icons.externalLink24.swiftUIImage .imageStyle(.rowIcon) } } diff --git a/BitwardenShared/UI/Platform/Settings/Settings/About/FlightRecorderLogs/FlightRecorderLogsView.swift b/BitwardenShared/UI/Platform/Settings/Settings/About/FlightRecorderLogs/FlightRecorderLogsView.swift index 6c941787b8..5f2cab03df 100644 --- a/BitwardenShared/UI/Platform/Settings/Settings/About/FlightRecorderLogs/FlightRecorderLogsView.swift +++ b/BitwardenShared/UI/Platform/Settings/Settings/About/FlightRecorderLogs/FlightRecorderLogsView.swift @@ -107,7 +107,7 @@ struct FlightRecorderLogsView: View { } .disabled(log.isActiveLog) } label: { - Asset.Images.ellipsisHorizontal24.swiftUIImage + SharedAsset.Icons.ellipsisHorizontal24.swiftUIImage .foregroundStyle(SharedAsset.Colors.textSecondary.swiftUIColor) } .accessibilityLabel(Localizations.more) diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/AccountSecurityView.swift b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/AccountSecurityView.swift index 2beadef5d4..6d7d3f5b2e 100644 --- a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/AccountSecurityView.swift +++ b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/AccountSecurityView.swift @@ -95,7 +95,7 @@ struct AccountSecurityView: View { ) { store.send(.twoStepLoginPressed) } trailingContent: { - Image(asset: Asset.Images.externalLink24) + Image(asset: SharedAsset.Icons.externalLink24) .imageStyle(.rowIcon) } @@ -136,7 +136,7 @@ struct AccountSecurityView: View { ) { store.send(.pendingLoginRequestsTapped) } trailingContent: { - Image(asset: Asset.Images.chevronRight16) + Image(asset: SharedAsset.Icons.chevronRight16) .imageStyle(.accessoryIcon16) } .contentBlock() diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/DeleteAccount/DeleteAccountState.swift b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/DeleteAccount/DeleteAccountState.swift index 0e1b01e2aa..66a9dc02d7 100644 --- a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/DeleteAccount/DeleteAccountState.swift +++ b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/DeleteAccount/DeleteAccountState.swift @@ -17,11 +17,11 @@ struct DeleteAccountState: Equatable { } /// The main icon to be displayed. - var mainIcon: ImageAsset { + var mainIcon: SharedImageAsset { return if shouldPreventUserFromDeletingAccount { - Asset.Images.circleX16 + SharedAsset.Icons.circleX16 } else { - Asset.Images.warning24 + SharedAsset.Icons.warning24 } } diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/PendingRequestsView.swift b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/PendingRequestsView.swift index 252f8a964b..12f091ce91 100644 --- a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/PendingRequestsView.swift +++ b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/PendingRequestsView.swift @@ -52,7 +52,7 @@ struct PendingRequestsView: View { HStack(spacing: 4) { Spacer() - Image(decorative: Asset.Images.trash16) + Image(decorative: SharedAsset.Icons.trash16) .imageStyle(.accessoryIcon16(scaleWithFont: true)) Text(Localizations.declineAllRequests) diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Appearance/AppearanceView.swift b/BitwardenShared/UI/Platform/Settings/Settings/Appearance/AppearanceView.swift index 20e79b6630..b1c8c61e0e 100644 --- a/BitwardenShared/UI/Platform/Settings/Settings/Appearance/AppearanceView.swift +++ b/BitwardenShared/UI/Platform/Settings/Settings/Appearance/AppearanceView.swift @@ -47,7 +47,7 @@ struct AppearanceView: View { .foregroundColor(Color(asset: SharedAsset.Colors.textPrimary)) .multilineTextAlignment(.leading) } accessoryContent: { - Asset.Images.chevronDown24.swiftUIImage + SharedAsset.Icons.chevronDown24.swiftUIImage .imageStyle(.rowIcon) } } @@ -83,7 +83,7 @@ struct AppearanceView: View { Button { openURL(ExternalLinksConstants.websiteIconsHelp) } label: { - Asset.Images.questionCircle16.swiftUIImage + SharedAsset.Icons.questionCircle16.swiftUIImage .scaledFrame(width: 16, height: 16) .accessibilityLabel(Localizations.learnMore) } diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Appearance/SelectLanguage/SelectLanguageView.swift b/BitwardenShared/UI/Platform/Settings/Settings/Appearance/SelectLanguage/SelectLanguageView.swift index 6866c9dca2..85b14954d6 100644 --- a/BitwardenShared/UI/Platform/Settings/Settings/Appearance/SelectLanguage/SelectLanguageView.swift +++ b/BitwardenShared/UI/Platform/Settings/Settings/Appearance/SelectLanguage/SelectLanguageView.swift @@ -35,7 +35,7 @@ struct SelectLanguageView: View { @ViewBuilder private func checkmarkView(_ languageOption: LanguageOption) -> some View { if languageOption == store.state.currentLanguage { - Image(asset: Asset.Images.check24) + Image(asset: SharedAsset.Icons.check24) .imageStyle(.rowIcon) } } diff --git a/BitwardenShared/UI/Platform/Settings/Settings/SettingsListItem.swift b/BitwardenShared/UI/Platform/Settings/Settings/SettingsListItem.swift index 056a17247a..061200afbb 100644 --- a/BitwardenShared/UI/Platform/Settings/Settings/SettingsListItem.swift +++ b/BitwardenShared/UI/Platform/Settings/Settings/SettingsListItem.swift @@ -19,7 +19,7 @@ struct SettingsListItem: View { let badgeValue: String? /// The optional icon to display on the leading edge of the list item. - let icon: ImageAsset? + let icon: SharedImageAsset? /// The name of the list item. let name: String @@ -87,7 +87,7 @@ struct SettingsListItem: View { _ name: String, accessibilityIdentifier: String? = nil, badgeValue: String? = nil, - icon: ImageAsset? = nil, + icon: SharedImageAsset? = nil, nameAccessibilityID: String? = nil, action: @escaping () -> Void, @ViewBuilder trailingContent: @escaping () -> Content? = { EmptyView() } @@ -108,12 +108,12 @@ struct SettingsListItem: View { #Preview { ScrollView { ContentBlock(dividerLeadingPadding: 16) { - SettingsListItem("Account Security", icon: Asset.Images.locked24) {} trailingContent: { + SettingsListItem("Account Security", icon: SharedAsset.Icons.locked24) {} trailingContent: { Text("Trailing content") } SettingsListItem("Account Security") {} trailingContent: { - Image(asset: Asset.Images.externalLink24) + Image(asset: SharedAsset.Icons.externalLink24) } SettingsListItem("Account Security") {} @@ -121,7 +121,7 @@ struct SettingsListItem: View { SettingsListItem("Account Security with Badge!", badgeValue: "3") {} SettingsListItem("Account Security with Badge!", badgeValue: "4") {} trailingContent: { - Image(asset: Asset.Images.externalLink24) + Image(asset: SharedAsset.Icons.externalLink24) } } } diff --git a/BitwardenShared/UI/Platform/Settings/Settings/SettingsView.swift b/BitwardenShared/UI/Platform/Settings/Settings/SettingsView.swift index 9f33d0b191..8fe075dda6 100644 --- a/BitwardenShared/UI/Platform/Settings/Settings/SettingsView.swift +++ b/BitwardenShared/UI/Platform/Settings/Settings/SettingsView.swift @@ -34,7 +34,7 @@ struct SettingsView: View { /// The chevron shown in the settings list item. private var chevron: some View { - Image(asset: Asset.Images.chevronRight16) + Image(asset: SharedAsset.Icons.chevronRight16) .foregroundColor(Color(asset: SharedAsset.Colors.textSecondary)) } @@ -61,7 +61,7 @@ struct SettingsView: View { private var aboutRow: some View { SettingsListItem( Localizations.about, - icon: Asset.Images.informationCircle24 + icon: SharedAsset.Icons.informationCircle24 ) { store.send(.aboutPressed) } trailingContent: { @@ -75,7 +75,7 @@ struct SettingsView: View { SettingsListItem( Localizations.accountSecurity, badgeValue: store.state.accountSecurityBadgeValue, - icon: Asset.Images.locked24 + icon: SharedAsset.Icons.locked24 ) { store.send(.accountSecurityPressed) } trailingContent: { @@ -86,7 +86,7 @@ struct SettingsView: View { /// The appearance settings row. private var appearanceRow: some View { - SettingsListItem(Localizations.appearance, icon: Asset.Images.paintBrush) { + SettingsListItem(Localizations.appearance, icon: SharedAsset.Icons.paintBrush) { store.send(.appearancePressed) } trailingContent: { chevron @@ -99,7 +99,7 @@ struct SettingsView: View { SettingsListItem( Localizations.autofill, badgeValue: store.state.autofillBadgeValue, - icon: Asset.Images.checkCircle24 + icon: SharedAsset.Icons.checkCircle24 ) { store.send(.autoFillPressed) } trailingContent: { @@ -110,7 +110,7 @@ struct SettingsView: View { /// The other settings row. private var otherRow: some View { - SettingsListItem(Localizations.other, icon: Asset.Images.other) { + SettingsListItem(Localizations.other, icon: SharedAsset.Icons.other) { store.send(.otherPressed) } trailingContent: { chevron @@ -123,7 +123,7 @@ struct SettingsView: View { SettingsListItem( Localizations.vault, badgeValue: store.state.vaultBadgeValue, - icon: Asset.Images.vaultSettings + icon: SharedAsset.Icons.vaultSettings ) { store.send(.vaultPressed) } trailingContent: { diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/ExportSettings/ExportSettingsView.swift b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/ExportSettings/ExportSettingsView.swift index 135f228833..5ee8154399 100644 --- a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/ExportSettings/ExportSettingsView.swift +++ b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/ExportSettings/ExportSettingsView.swift @@ -39,7 +39,7 @@ struct ExportSettingsView: View { /// The chevron shown in the settings list item. private var chevron: some View { - Image(asset: Asset.Images.chevronRight16) + Image(asset: SharedAsset.Icons.chevronRight16) .foregroundColor(Color(asset: SharedAsset.Colors.textSecondary)) } } diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/VaultSettingsView.swift b/BitwardenShared/UI/Platform/Settings/Settings/Vault/VaultSettingsView.swift index f7768338dd..04605a34fe 100644 --- a/BitwardenShared/UI/Platform/Settings/Settings/Vault/VaultSettingsView.swift +++ b/BitwardenShared/UI/Platform/Settings/Settings/Vault/VaultSettingsView.swift @@ -72,7 +72,7 @@ struct VaultSettingsView: View { SettingsListItem(Localizations.importItems) { store.send(.importItemsTapped) } trailingContent: { - Image(asset: Asset.Images.externalLink24) + Image(asset: SharedAsset.Icons.externalLink24) .imageStyle(.rowIcon) } .accessibilityIdentifier("ImportItemsLinkItemView") diff --git a/BitwardenShared/UI/Platform/Tabs/TabRoute.swift b/BitwardenShared/UI/Platform/Tabs/TabRoute.swift index ad61707e20..c6495db51c 100644 --- a/BitwardenShared/UI/Platform/Tabs/TabRoute.swift +++ b/BitwardenShared/UI/Platform/Tabs/TabRoute.swift @@ -25,13 +25,13 @@ extension TabRoute: TabRepresentable { public var image: UIImage? { switch self { case .generator: - Asset.Images.TabBar.generatorIdle.image + SharedAsset.Icons.TabBar.generatorIdle.image case .send: - Asset.Images.TabBar.sendIdle.image + SharedAsset.Icons.TabBar.sendIdle.image case .settings: - Asset.Images.TabBar.settingsIdle.image + SharedAsset.Icons.TabBar.settingsIdle.image case .vault: - Asset.Images.TabBar.vaultIdle.image + SharedAsset.Icons.TabBar.vaultIdle.image } } @@ -51,13 +51,13 @@ extension TabRoute: TabRepresentable { public var selectedImage: UIImage? { switch self { case .generator: - Asset.Images.TabBar.generatorActive.image + SharedAsset.Icons.TabBar.generatorActive.image case .send: - Asset.Images.TabBar.sendActive.image + SharedAsset.Icons.TabBar.sendActive.image case .settings: - Asset.Images.TabBar.settingsActive.image + SharedAsset.Icons.TabBar.settingsActive.image case .vault: - Asset.Images.TabBar.vaultActive.image + SharedAsset.Icons.TabBar.vaultActive.image } } diff --git a/BitwardenShared/UI/Platform/Tabs/TabRouteTests.swift b/BitwardenShared/UI/Platform/Tabs/TabRouteTests.swift index 306d0f45af..bcdd7b3ca7 100644 --- a/BitwardenShared/UI/Platform/Tabs/TabRouteTests.swift +++ b/BitwardenShared/UI/Platform/Tabs/TabRouteTests.swift @@ -13,7 +13,7 @@ class TabRouteTests: BitwardenTestCase { func test_generator_image() { XCTAssertEqual( TabRoute.generator(.generator()).image?.pngData(), - Asset.Images.TabBar.generatorIdle.image.pngData() + SharedAsset.Icons.TabBar.generatorIdle.image.pngData() ) } @@ -26,7 +26,7 @@ class TabRouteTests: BitwardenTestCase { func test_generator_selectedImage() { XCTAssertEqual( TabRoute.generator(.generator()).selectedImage?.pngData(), - Asset.Images.TabBar.generatorActive.image.pngData() + SharedAsset.Icons.TabBar.generatorActive.image.pngData() ) } @@ -39,7 +39,7 @@ class TabRouteTests: BitwardenTestCase { func test_send_image() { XCTAssertEqual( TabRoute.send.image?.pngData(), - Asset.Images.TabBar.sendIdle.image.pngData() + SharedAsset.Icons.TabBar.sendIdle.image.pngData() ) } @@ -52,7 +52,7 @@ class TabRouteTests: BitwardenTestCase { func test_send_selectedImage() { XCTAssertEqual( TabRoute.send.selectedImage?.pngData(), - Asset.Images.TabBar.sendActive.image.pngData() + SharedAsset.Icons.TabBar.sendActive.image.pngData() ) } @@ -65,7 +65,7 @@ class TabRouteTests: BitwardenTestCase { func test_settings_image() { XCTAssertEqual( TabRoute.settings(.settings(.tab)).image?.pngData(), - Asset.Images.TabBar.settingsIdle.image.pngData() + SharedAsset.Icons.TabBar.settingsIdle.image.pngData() ) } @@ -78,7 +78,7 @@ class TabRouteTests: BitwardenTestCase { func test_settings_selectedImage() { XCTAssertEqual( TabRoute.settings(.settings(.tab)).selectedImage?.pngData(), - Asset.Images.TabBar.settingsActive.image.pngData() + SharedAsset.Icons.TabBar.settingsActive.image.pngData() ) } @@ -94,7 +94,7 @@ class TabRouteTests: BitwardenTestCase { func test_vault_image() { XCTAssertEqual( TabRoute.vault(.list).image?.pngData(), - Asset.Images.TabBar.vaultIdle.image.pngData() + SharedAsset.Icons.TabBar.vaultIdle.image.pngData() ) } @@ -107,7 +107,7 @@ class TabRouteTests: BitwardenTestCase { func test_vault_selectedImage() { XCTAssertEqual( TabRoute.vault(.list).selectedImage?.pngData(), - Asset.Images.TabBar.vaultActive.image.pngData() + SharedAsset.Icons.TabBar.vaultActive.image.pngData() ) } diff --git a/BitwardenShared/UI/Tools/ExportCXF/ExportCXF/ExportCXFState.swift b/BitwardenShared/UI/Tools/ExportCXF/ExportCXF/ExportCXFState.swift index 28151ebcbe..5ea4865404 100644 --- a/BitwardenShared/UI/Tools/ExportCXF/ExportCXF/ExportCXFState.swift +++ b/BitwardenShared/UI/Tools/ExportCXF/ExportCXF/ExportCXFState.swift @@ -33,12 +33,12 @@ struct ExportCXFState: Equatable, Sendable { } /// The main icon to be displayed. - var mainIcon: ImageAsset { + var mainIcon: SharedImageAsset { return switch status { case .prepared, .start: - Asset.Images.fileUpload24 + SharedAsset.Icons.fileUpload24 case .failure: - Asset.Images.circleX16 + SharedAsset.Icons.circleX16 } } diff --git a/BitwardenShared/UI/Tools/ExportCXF/ExportCXF/ExportCXFStateTests.swift b/BitwardenShared/UI/Tools/ExportCXF/ExportCXF/ExportCXFStateTests.swift index c13e0dd503..bfde6d66c3 100644 --- a/BitwardenShared/UI/Tools/ExportCXF/ExportCXF/ExportCXFStateTests.swift +++ b/BitwardenShared/UI/Tools/ExportCXF/ExportCXF/ExportCXFStateTests.swift @@ -48,13 +48,13 @@ class ExportCXFStateTests: BitwardenTestCase { /// `getter:mainIcon` gets the main icon depending on the status. func test_mainIcon() { subject.status = .start - XCTAssertEqual(subject.mainIcon.name, Asset.Images.fileUpload24.name) + XCTAssertEqual(subject.mainIcon.name, SharedAsset.Icons.fileUpload24.name) subject.status = .prepared(itemsToExport: []) - XCTAssertEqual(subject.mainIcon.name, Asset.Images.fileUpload24.name) + XCTAssertEqual(subject.mainIcon.name, SharedAsset.Icons.fileUpload24.name) subject.status = .failure(message: "") - XCTAssertEqual(subject.mainIcon.name, Asset.Images.circleX16.name) + XCTAssertEqual(subject.mainIcon.name, SharedAsset.Icons.circleX16.name) } /// `getter:message` gets the message depending on the status. diff --git a/BitwardenShared/UI/Tools/Generator/Generator/GeneratorView.swift b/BitwardenShared/UI/Tools/Generator/Generator/GeneratorView.swift index 76917e5e7f..d610a97ef5 100644 --- a/BitwardenShared/UI/Tools/Generator/Generator/GeneratorView.swift +++ b/BitwardenShared/UI/Tools/Generator/Generator/GeneratorView.swift @@ -248,7 +248,7 @@ struct GeneratorView: View { .accessibilityIdentifier("GeneratedPasswordLabel") } accessoryContent: { AccessoryButton( - asset: Asset.Images.generate24, + asset: SharedAsset.Icons.generate24, accessibilityLabel: Localizations.generatePassword, accessibilityIdentifier: "RegenerateValueButton" ) { @@ -285,7 +285,7 @@ struct GeneratorView: View { Button { openURL(ExternalLinksConstants.generatorUsernameTypes) } label: { - Asset.Images.questionCircle12.swiftUIImage + SharedAsset.Icons.questionCircle12.swiftUIImage .scaledFrame(width: 12, height: 12) } .buttonStyle(.fieldLabelIcon) diff --git a/BitwardenShared/UI/Tools/ImportCXF/ImportCXF/ImportCXFState.swift b/BitwardenShared/UI/Tools/ImportCXF/ImportCXF/ImportCXFState.swift index 3f0fe46fda..a5c4687f9e 100644 --- a/BitwardenShared/UI/Tools/ImportCXF/ImportCXF/ImportCXFState.swift +++ b/BitwardenShared/UI/Tools/ImportCXF/ImportCXF/ImportCXFState.swift @@ -46,14 +46,14 @@ struct ImportCXFState: Equatable, Sendable { } /// The main icon to be displayed. - var mainIcon: ImageAsset { + var mainIcon: SharedImageAsset { return switch status { case .importing, .start: - Asset.Images.fileUpload24 + SharedAsset.Icons.fileUpload24 case .success: - Asset.Images.checkCircle24 + SharedAsset.Icons.checkCircle24 case .failure: - Asset.Images.circleX16 + SharedAsset.Icons.circleX16 } } diff --git a/BitwardenShared/UI/Tools/ImportCXF/ImportCXF/ImportCXFStateTests.swift b/BitwardenShared/UI/Tools/ImportCXF/ImportCXF/ImportCXFStateTests.swift index ed828e2c84..1451dc354a 100644 --- a/BitwardenShared/UI/Tools/ImportCXF/ImportCXF/ImportCXFStateTests.swift +++ b/BitwardenShared/UI/Tools/ImportCXF/ImportCXF/ImportCXFStateTests.swift @@ -44,16 +44,16 @@ class ImportCXFStateTests: BitwardenTestCase { /// `getter:mainIcon` returns the appropriate value depending on the `status`. func test_mainIcon() { subject.status = .start - XCTAssertEqual(subject.mainIcon.name, Asset.Images.fileUpload24.name) + XCTAssertEqual(subject.mainIcon.name, SharedAsset.Icons.fileUpload24.name) subject.status = .importing - XCTAssertEqual(subject.mainIcon.name, Asset.Images.fileUpload24.name) + XCTAssertEqual(subject.mainIcon.name, SharedAsset.Icons.fileUpload24.name) subject.status = .success(totalImportedCredentials: 1, importedResults: []) - XCTAssertEqual(subject.mainIcon.name, Asset.Images.checkCircle24.name) + XCTAssertEqual(subject.mainIcon.name, SharedAsset.Icons.checkCircle24.name) subject.status = .failure(message: "") - XCTAssertEqual(subject.mainIcon.name, Asset.Images.circleX16.name) + XCTAssertEqual(subject.mainIcon.name, SharedAsset.Icons.circleX16.name) } /// `getter:message` returns the appropriate value depending on the `status`. diff --git a/BitwardenShared/UI/Tools/PasswordHistory/PasswordHistoryList/PasswordHistoryListView.swift b/BitwardenShared/UI/Tools/PasswordHistory/PasswordHistoryList/PasswordHistoryListView.swift index 102412d33d..6f662d977f 100644 --- a/BitwardenShared/UI/Tools/PasswordHistory/PasswordHistoryList/PasswordHistoryListView.swift +++ b/BitwardenShared/UI/Tools/PasswordHistory/PasswordHistoryList/PasswordHistoryListView.swift @@ -99,7 +99,7 @@ struct PasswordHistoryListView: View { Button { store.send(.copyPassword(passwordHistory)) } label: { - Image(asset: Asset.Images.copy24) + Image(asset: SharedAsset.Icons.copy24) .imageStyle(.rowIcon) } .accessibilityLabel(Localizations.copyPassword) diff --git a/BitwardenShared/UI/Tools/Send/Send/SendList/SendListItem.swift b/BitwardenShared/UI/Tools/Send/Send/SendList/SendListItem.swift index 9ac5799a2b..59307429fa 100644 --- a/BitwardenShared/UI/Tools/Send/Send/SendList/SendListItem.swift +++ b/BitwardenShared/UI/Tools/Send/Send/SendList/SendListItem.swift @@ -1,3 +1,4 @@ +import BitwardenResources @preconcurrency import BitwardenSdk /// Data model for an item displayed in the vault list. @@ -36,21 +37,21 @@ extension SendListItem { extension SendListItem { /// An image asset for this item that can be used in the UI. - var icon: ImageAsset { + var icon: SharedImageAsset { switch itemType { case let .send(sendView): switch sendView.type { case .file: - Asset.Images.file24 + SharedAsset.Icons.file24 case .text: - Asset.Images.fileText24 + SharedAsset.Icons.fileText24 } case let .group(group, _): switch group { case .file: - Asset.Images.file24 + SharedAsset.Icons.file24 case .text: - Asset.Images.fileText24 + SharedAsset.Icons.fileText24 } } } diff --git a/BitwardenShared/UI/Tools/Send/Send/SendList/SendListItemRowView.swift b/BitwardenShared/UI/Tools/Send/Send/SendList/SendListItemRowView.swift index e26db91c03..d48b6d05ed 100644 --- a/BitwardenShared/UI/Tools/Send/Send/SendList/SendListItemRowView.swift +++ b/BitwardenShared/UI/Tools/Send/Send/SendList/SendListItemRowView.swift @@ -185,7 +185,7 @@ struct SendListItemRowView: View { } } label: { - Asset.Images.ellipsisHorizontal24.swiftUIImage + SharedAsset.Icons.ellipsisHorizontal24.swiftUIImage .foregroundStyle(SharedAsset.Colors.textSecondary.swiftUIColor) } .accessibilityIdentifier("SendOptionsButton") @@ -227,7 +227,7 @@ struct SendListItemRowView: View { icons.append( SendListItemIcon( accessibilityID: "DisabledSendIcon", - asset: Asset.Images.warning16.swiftUIImage + asset: SharedAsset.Icons.warning16.swiftUIImage ) ) } @@ -236,7 +236,7 @@ struct SendListItemRowView: View { icons.append( SendListItemIcon( accessibilityID: "PasswordProtectedSendIcon", - asset: Asset.Images.key16.swiftUIImage + asset: SharedAsset.Icons.key16.swiftUIImage ) ) } @@ -246,7 +246,7 @@ struct SendListItemRowView: View { icons.append( SendListItemIcon( accessibilityID: "MaxAccessSendIcon", - asset: Asset.Images.doNot16.swiftUIImage + asset: SharedAsset.Icons.doNot16.swiftUIImage ) ) } @@ -255,7 +255,7 @@ struct SendListItemRowView: View { icons.append( SendListItemIcon( accessibilityID: "ExpiredSendIcon", - asset: Asset.Images.clock16.swiftUIImage + asset: SharedAsset.Icons.clock16.swiftUIImage ) ) } @@ -264,7 +264,7 @@ struct SendListItemRowView: View { icons.append( SendListItemIcon( accessibilityID: "PendingDeletionSendIcon", - asset: Asset.Images.trash16.swiftUIImage + asset: SharedAsset.Icons.trash16.swiftUIImage ) ) } diff --git a/BitwardenShared/UI/Tools/Send/Send/SendList/SendListView.swift b/BitwardenShared/UI/Tools/Send/Send/SendList/SendListView.swift index 3947689ef8..602f90b5aa 100644 --- a/BitwardenShared/UI/Tools/Send/Send/SendList/SendListView.swift +++ b/BitwardenShared/UI/Tools/Send/Send/SendList/SendListView.swift @@ -88,7 +88,7 @@ private struct MainSendListView: View { .shareFilesAndDataSecurelyWithAnyoneOnAnyPlatformYourInformationWillRemainEndToEndEncrypted ) { Group { - let newSendLabel = Label(Localizations.newSend, image: Asset.Images.plus16.swiftUIImage) + let newSendLabel = Label(Localizations.newSend, image: SharedAsset.Icons.plus16.swiftUIImage) if let sendType = store.state.type { AsyncButton { await store.perform(.addItemPressed(sendType)) @@ -250,7 +250,7 @@ struct SendListView: View { Button { store.send(.infoButtonPressed) } label: { - Image(asset: Asset.Images.questionCircle24, label: Text(Localizations.aboutSend)) + Image(asset: SharedAsset.Icons.questionCircle24, label: Text(Localizations.aboutSend)) .foregroundColor(SharedAsset.Colors.iconSecondary.swiftUIColor) } .frame(minHeight: 44) diff --git a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/AddEditSendItemView.swift b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/AddEditSendItemView.swift index 50be284fde..4dc1337220 100644 --- a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/AddEditSendItemView.swift +++ b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/AddEditSendItemView.swift @@ -170,7 +170,7 @@ struct AddEditSendItemView: View { // swiftlint:disable:this type_body_length AsyncButton { await store.perform(.deletePressed) } label: { - Label(Localizations.deleteSend, image: Asset.Images.trash16.swiftUIImage, scaleImageDimension: 16) + Label(Localizations.deleteSend, image: SharedAsset.Icons.trash16.swiftUIImage, scaleImageDimension: 16) } .buttonStyle(.secondary(isDestructive: true, size: .medium)) } diff --git a/BitwardenShared/UI/Tools/Send/SendItem/ViewSendItem/ViewSendItemView.swift b/BitwardenShared/UI/Tools/Send/SendItem/ViewSendItem/ViewSendItemView.swift index fd0007fbb3..a97d78e018 100644 --- a/BitwardenShared/UI/Tools/Send/SendItem/ViewSendItem/ViewSendItemView.swift +++ b/BitwardenShared/UI/Tools/Send/SendItem/ViewSendItem/ViewSendItemView.swift @@ -46,7 +46,7 @@ struct ViewSendItemView: View { AsyncButton { await store.perform(.deleteSend) } label: { - Label(Localizations.deleteSend, image: Asset.Images.trash16.swiftUIImage, scaleImageDimension: 16) + Label(Localizations.deleteSend, image: SharedAsset.Icons.trash16.swiftUIImage, scaleImageDimension: 16) } .buttonStyle(.secondary(isDestructive: true, size: .medium)) .accessibilityIdentifier("ViewSendDeleteButton") @@ -125,7 +125,7 @@ struct ViewSendItemView: View { Button { store.send(.copyShareURL) } label: { - Label(Localizations.copy, image: Asset.Images.copy16.swiftUIImage, scaleImageDimension: 16) + Label(Localizations.copy, image: SharedAsset.Icons.copy16.swiftUIImage, scaleImageDimension: 16) } .buttonStyle(.primary(size: .medium)) .accessibilityIdentifier("ViewSendCopyButton") @@ -133,7 +133,7 @@ struct ViewSendItemView: View { Button { store.send(.shareSend) } label: { - Label(Localizations.share, image: Asset.Images.share16.swiftUIImage, scaleImageDimension: 16) + Label(Localizations.share, image: SharedAsset.Icons.share16.swiftUIImage, scaleImageDimension: 16) } .buttonStyle(.secondary(size: .medium)) .accessibilityIdentifier("ViewSendShareButton") diff --git a/BitwardenShared/UI/Vault/ImportLogins/ImportLoginsSuccess/ImportLoginsSuccessView.swift b/BitwardenShared/UI/Vault/ImportLogins/ImportLoginsSuccess/ImportLoginsSuccessView.swift index d235e88f2c..b2432c6131 100644 --- a/BitwardenShared/UI/Vault/ImportLogins/ImportLoginsSuccess/ImportLoginsSuccessView.swift +++ b/BitwardenShared/UI/Vault/ImportLogins/ImportLoginsSuccess/ImportLoginsSuccessView.swift @@ -25,20 +25,20 @@ struct ImportLoginsSuccessView: View { ContentBlock(dividerLeadingPadding: 48) { rowView( - image: Asset.Images.puzzle24, + image: SharedAsset.Icons.puzzle24, title: Localizations.downloadTheBrowserExtension, subtitle: Localizations .goToBitwardenToIntegrateBitwardenIntoYourFavoriteBrowserForASeamlessExperience ) rowView( - image: Asset.Images.desktop24, + image: SharedAsset.Icons.desktop24, title: Localizations.useTheWebApp, subtitle: Localizations.logInAtBitwardenToEasilyManageYourAccountAndUpdateSettings ) rowView( - image: Asset.Images.shield24, + image: SharedAsset.Icons.shield24, title: Localizations.autofillPasswords, subtitle: Localizations.setUpAutofillOnAllYourDevicesToLoginWithASingleTapAnywhere ) @@ -75,7 +75,7 @@ struct ImportLoginsSuccessView: View { /// @ViewBuilder private func rowView( - image: ImageAsset, + image: SharedImageAsset, title: String, subtitle: String? = nil ) -> some View { diff --git a/BitwardenShared/UI/Vault/Utilities/VaultItemWithDecorativeIcon.swift b/BitwardenShared/UI/Vault/Utilities/VaultItemWithDecorativeIcon.swift index 12f1d83852..08b26e997d 100644 --- a/BitwardenShared/UI/Vault/Utilities/VaultItemWithDecorativeIcon.swift +++ b/BitwardenShared/UI/Vault/Utilities/VaultItemWithDecorativeIcon.swift @@ -1,9 +1,10 @@ +import BitwardenResources import BitwardenSdk /// A protocol to be used by vault list items that have decorative icons. protocol VaultItemWithDecorativeIcon { /// An image asset for this item that can be used in the UI. - var icon: ImageAsset { get } + var icon: SharedImageAsset { get } /// The accessibility ID for the ciphers icon. var iconAccessibilityId: String { get } diff --git a/BitwardenShared/UI/Vault/Vault/AutofillList/VaultAutofillListView.swift b/BitwardenShared/UI/Vault/Vault/AutofillList/VaultAutofillListView.swift index e0f378130a..24e40bbf7f 100644 --- a/BitwardenShared/UI/Vault/Vault/AutofillList/VaultAutofillListView.swift +++ b/BitwardenShared/UI/Vault/Vault/AutofillList/VaultAutofillListView.swift @@ -225,7 +225,7 @@ private struct VaultAutofillListSearchableView: View { Label { Text(store.state.emptyViewButtonText) } icon: { - Asset.Images.plus16.swiftUIImage + SharedAsset.Icons.plus16.swiftUIImage .imageStyle(.accessoryIcon16( color: SharedAsset.Colors.buttonFilledForeground.swiftUIColor, scaleWithFont: true diff --git a/BitwardenShared/UI/Vault/Vault/VaultGroup/VaultGroupView.swift b/BitwardenShared/UI/Vault/Vault/VaultGroup/VaultGroupView.swift index da5579f240..d124794086 100644 --- a/BitwardenShared/UI/Vault/Vault/VaultGroup/VaultGroupView.swift +++ b/BitwardenShared/UI/Vault/Vault/VaultGroup/VaultGroupView.swift @@ -82,7 +82,7 @@ struct VaultGroupView: View { if let newItemButtonType = store.state.newItemButtonType { let newItemLabel = Label( store.state.addItemButtonTitle, - image: Asset.Images.plus16.swiftUIImage + image: SharedAsset.Icons.plus16.swiftUIImage ) Group { diff --git a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/VaultItemSelectionView.swift b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/VaultItemSelectionView.swift index 33b4d964bb..f28c249440 100644 --- a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/VaultItemSelectionView.swift +++ b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/VaultItemSelectionView.swift @@ -162,7 +162,7 @@ private struct VaultItemSelectionSearchableView: View { Label { Text(Localizations.newItem) } icon: { - Asset.Images.plus16.swiftUIImage + SharedAsset.Icons.plus16.swiftUIImage .imageStyle(.accessoryIcon16( color: SharedAsset.Colors.buttonFilledForeground.swiftUIColor, scaleWithFont: true diff --git a/BitwardenShared/UI/Vault/Vault/VaultList/SearchVaultFilterRowView/SearchVaultFilterRowView.swift b/BitwardenShared/UI/Vault/Vault/VaultList/SearchVaultFilterRowView/SearchVaultFilterRowView.swift index 74ae6efbcc..f76eab8a25 100644 --- a/BitwardenShared/UI/Vault/Vault/VaultList/SearchVaultFilterRowView/SearchVaultFilterRowView.swift +++ b/BitwardenShared/UI/Vault/Vault/VaultList/SearchVaultFilterRowView/SearchVaultFilterRowView.swift @@ -41,7 +41,7 @@ struct SearchVaultFilterRowView: View { EmptyView() } } label: { - Asset.Images.ellipsisHorizontal24.swiftUIImage + SharedAsset.Icons.ellipsisHorizontal24.swiftUIImage .imageStyle(.rowIcon) .frame(width: 44, height: 44, alignment: .trailing) .contentShape(Rectangle()) diff --git a/BitwardenShared/UI/Vault/Vault/VaultList/VaultListItem.swift b/BitwardenShared/UI/Vault/Vault/VaultList/VaultListItem.swift index fbaa9aace8..6d5310f5d0 100644 --- a/BitwardenShared/UI/Vault/Vault/VaultList/VaultListItem.swift +++ b/BitwardenShared/UI/Vault/Vault/VaultList/VaultListItem.swift @@ -1,3 +1,4 @@ +import BitwardenResources @preconcurrency import BitwardenSdk import Foundation @@ -95,45 +96,45 @@ extension VaultListItem { } /// An image asset for this item that can be used in the UI. - var icon: ImageAsset { + var icon: SharedImageAsset { switch itemType { case let .cipher(cipherItem, fido2CredentialAutofillView): switch cipherItem.type { case .card: - Asset.Images.card24 + SharedAsset.Icons.card24 case .identity: - Asset.Images.idCard24 + SharedAsset.Icons.idCard24 case .login: - fido2CredentialAutofillView != nil ? Asset.Images.passkey24 : Asset.Images.globe24 + fido2CredentialAutofillView != nil ? SharedAsset.Icons.passkey24 : SharedAsset.Icons.globe24 case .secureNote: - Asset.Images.file24 + SharedAsset.Icons.file24 case .sshKey: - Asset.Images.key24 + SharedAsset.Icons.key24 } case let .group(group, _): switch group { case .card: - Asset.Images.card24 + SharedAsset.Icons.card24 case .collection: - Asset.Images.collections24 + SharedAsset.Icons.collections24 case .folder, .noFolder: - Asset.Images.folder24 + SharedAsset.Icons.folder24 case .identity: - Asset.Images.idCard24 + SharedAsset.Icons.idCard24 case .login: - Asset.Images.globe24 + SharedAsset.Icons.globe24 case .secureNote: - Asset.Images.file24 + SharedAsset.Icons.file24 case .sshKey: - Asset.Images.key24 + SharedAsset.Icons.key24 case .totp: - Asset.Images.clock24 + SharedAsset.Icons.clock24 case .trash: - Asset.Images.trash24 + SharedAsset.Icons.trash24 } case .totp: - Asset.Images.clock24 + SharedAsset.Icons.clock24 } } diff --git a/BitwardenShared/UI/Vault/Vault/VaultList/VaultListItemTests.swift b/BitwardenShared/UI/Vault/Vault/VaultList/VaultListItemTests.swift index b7758ba003..22ca45cf0a 100644 --- a/BitwardenShared/UI/Vault/Vault/VaultList/VaultListItemTests.swift +++ b/BitwardenShared/UI/Vault/Vault/VaultList/VaultListItemTests.swift @@ -1,3 +1,4 @@ +import BitwardenResources import BitwardenSdk import TestHelpers import XCTest @@ -119,76 +120,76 @@ class VaultListItemTests: BitwardenTestCase { // swiftlint:disable:this type_bod func test_icon() { // swiftlint:disable:this function_body_length XCTAssertEqual( VaultListItem(cipherListView: .fixture(type: .card(.init(brand: nil))))?.icon.name, - Asset.Images.card24.name + SharedAsset.Icons.card24.name ) XCTAssertEqual( VaultListItem(cipherListView: .fixture(type: .identity))?.icon.name, - Asset.Images.idCard24.name + SharedAsset.Icons.idCard24.name ) XCTAssertEqual( VaultListItem(cipherListView: .fixture(login: .fixture()))?.icon.name, - Asset.Images.globe24.name + SharedAsset.Icons.globe24.name ) XCTAssertEqual( VaultListItem( cipherListView: .fixture(login: .fixture()), fido2CredentialAutofillView: .fixture() )?.icon.name, - Asset.Images.passkey24.name + SharedAsset.Icons.passkey24.name ) XCTAssertEqual( VaultListItem(cipherListView: .fixture(type: .secureNote))?.icon.name, - Asset.Images.file24.name + SharedAsset.Icons.file24.name ) XCTAssertEqual( VaultListItem(cipherListView: .fixture(type: .sshKey))?.icon.name, - Asset.Images.key24.name + SharedAsset.Icons.key24.name ) XCTAssertEqual( VaultListItem(id: "", itemType: .group(.card, 1)).icon.name, - Asset.Images.card24.name + SharedAsset.Icons.card24.name ) XCTAssertEqual( VaultListItem(id: "", itemType: .group(.collection(id: "", name: "", organizationId: "1"), 1)).icon.name, - Asset.Images.collections24.name + SharedAsset.Icons.collections24.name ) XCTAssertEqual( VaultListItem(id: "", itemType: .group(.folder(id: "", name: ""), 1)).icon.name, - Asset.Images.folder24.name + SharedAsset.Icons.folder24.name ) XCTAssertEqual( VaultListItem(id: "", itemType: .group(.identity, 1)).icon.name, - Asset.Images.idCard24.name + SharedAsset.Icons.idCard24.name ) XCTAssertEqual( VaultListItem(id: "", itemType: .group(.login, 1)).icon.name, - Asset.Images.globe24.name + SharedAsset.Icons.globe24.name ) XCTAssertEqual( VaultListItem(id: "", itemType: .group(.secureNote, 1)).icon.name, - Asset.Images.file24.name + SharedAsset.Icons.file24.name ) XCTAssertEqual( VaultListItem(id: "", itemType: .group(.sshKey, 1)).icon.name, - Asset.Images.key24.name + SharedAsset.Icons.key24.name ) XCTAssertEqual( VaultListItem(id: "", itemType: .group(.totp, 1)).icon.name, - Asset.Images.clock24.name + SharedAsset.Icons.clock24.name ) XCTAssertEqual( VaultListItem(id: "", itemType: .group(.trash, 1)).icon.name, - Asset.Images.trash24.name + SharedAsset.Icons.trash24.name ) XCTAssertEqual( VaultListItem(id: "", itemType: .group(.trash, 1)).icon.name, - Asset.Images.trash24.name + SharedAsset.Icons.trash24.name ) XCTAssertEqual( VaultListItem.fixtureTOTP(totp: .fixture()).icon.name, - Asset.Images.clock24.name + SharedAsset.Icons.clock24.name ) } diff --git a/BitwardenShared/UI/Vault/Vault/VaultList/VaultListView.swift b/BitwardenShared/UI/Vault/Vault/VaultList/VaultListView.swift index aa4a7557e1..7b808d7d94 100644 --- a/BitwardenShared/UI/Vault/Vault/VaultList/VaultListView.swift +++ b/BitwardenShared/UI/Vault/Vault/VaultList/VaultListView.swift @@ -104,7 +104,7 @@ private struct SearchableVaultListView: View { store.send(.addItemPressed(.login)) } label: { HStack { - Image(decorative: Asset.Images.plus16) + Image(decorative: SharedAsset.Icons.plus16) .resizable() .frame(width: 16, height: 16) Text(Localizations.newLogin) diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/CardComponent.swift b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/CardComponent.swift index b69866ac9d..b7614e27ac 100644 --- a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/CardComponent.swift +++ b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/CardComponent.swift @@ -140,28 +140,28 @@ extension CardComponent.Brand: Menuable { extension CardComponent.Brand { /// Gets the icon corresponding to each card brand. - var icon: ImageAsset { + var icon: SharedImageAsset { switch self { case .americanExpress: - Asset.Images.Cards.amex + SharedAsset.Icons.Cards.amex case .visa: - Asset.Images.Cards.visa + SharedAsset.Icons.Cards.visa case .mastercard: - Asset.Images.Cards.mastercard + SharedAsset.Icons.Cards.mastercard case .discover: - Asset.Images.Cards.discover + SharedAsset.Icons.Cards.discover case .dinersClub: - Asset.Images.Cards.dinersClub + SharedAsset.Icons.Cards.dinersClub case .jcb: - Asset.Images.Cards.jcb + SharedAsset.Icons.Cards.jcb case .maestro: - Asset.Images.Cards.maestro + SharedAsset.Icons.Cards.maestro case .unionPay: - Asset.Images.Cards.unionPay + SharedAsset.Icons.Cards.unionPay case .ruPay: - Asset.Images.Cards.ruPay + SharedAsset.Icons.Cards.ruPay case .other: - Asset.Images.card24 + SharedAsset.Icons.card24 } } } diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/CardComponentTests.swift b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/CardComponentTests.swift index 18a212e167..632935a3d6 100644 --- a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/CardComponentTests.swift +++ b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/CardComponentTests.swift @@ -1,5 +1,6 @@ // swiftlint:disable:this file_name +import BitwardenResources import XCTest @testable import BitwardenShared @@ -11,15 +12,15 @@ class CardComponentBrandTests: BitwardenTestCase { /// `getter:icon` returns the appropriate icon for each card brand. func test_icon() { - XCTAssertEqual(CardComponent.Brand.americanExpress.icon.name, Asset.Images.Cards.amex.name) - XCTAssertEqual(CardComponent.Brand.visa.icon.name, Asset.Images.Cards.visa.name) - XCTAssertEqual(CardComponent.Brand.mastercard.icon.name, Asset.Images.Cards.mastercard.name) - XCTAssertEqual(CardComponent.Brand.discover.icon.name, Asset.Images.Cards.discover.name) - XCTAssertEqual(CardComponent.Brand.dinersClub.icon.name, Asset.Images.Cards.dinersClub.name) - XCTAssertEqual(CardComponent.Brand.jcb.icon.name, Asset.Images.Cards.jcb.name) - XCTAssertEqual(CardComponent.Brand.maestro.icon.name, Asset.Images.Cards.maestro.name) - XCTAssertEqual(CardComponent.Brand.unionPay.icon.name, Asset.Images.Cards.unionPay.name) - XCTAssertEqual(CardComponent.Brand.ruPay.icon.name, Asset.Images.Cards.ruPay.name) - XCTAssertEqual(CardComponent.Brand.other.icon.name, Asset.Images.card24.name) + XCTAssertEqual(CardComponent.Brand.americanExpress.icon.name, SharedAsset.Icons.Cards.amex.name) + XCTAssertEqual(CardComponent.Brand.visa.icon.name, SharedAsset.Icons.Cards.visa.name) + XCTAssertEqual(CardComponent.Brand.mastercard.icon.name, SharedAsset.Icons.Cards.mastercard.name) + XCTAssertEqual(CardComponent.Brand.discover.icon.name, SharedAsset.Icons.Cards.discover.name) + XCTAssertEqual(CardComponent.Brand.dinersClub.icon.name, SharedAsset.Icons.Cards.dinersClub.name) + XCTAssertEqual(CardComponent.Brand.jcb.icon.name, SharedAsset.Icons.Cards.jcb.name) + XCTAssertEqual(CardComponent.Brand.maestro.icon.name, SharedAsset.Icons.Cards.maestro.name) + XCTAssertEqual(CardComponent.Brand.unionPay.icon.name, SharedAsset.Icons.Cards.unionPay.name) + XCTAssertEqual(CardComponent.Brand.ruPay.icon.name, SharedAsset.Icons.Cards.ruPay.name) + XCTAssertEqual(CardComponent.Brand.other.icon.name, SharedAsset.Icons.card24.name) } } diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCustomFields/AddEditCustomFieldsView.swift b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCustomFields/AddEditCustomFieldsView.swift index 631373a7d3..44c88b3026 100644 --- a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCustomFields/AddEditCustomFieldsView.swift +++ b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCustomFields/AddEditCustomFieldsView.swift @@ -126,10 +126,10 @@ struct AddEditCustomFieldsView: View { } label: { Group { if isInFieldLabel { - Asset.Images.cog16.swiftUIImage + SharedAsset.Icons.cog16.swiftUIImage .imageStyle(.accessoryIcon16(color: SharedAsset.Colors.textInteraction.swiftUIColor)) } else { - Asset.Images.cog24.swiftUIImage + SharedAsset.Icons.cog24.swiftUIImage .imageStyle(.accessoryIcon24) } } diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditItemView.swift b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditItemView.swift index d3cdfb5329..447a870cc5 100644 --- a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditItemView.swift +++ b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditItemView.swift @@ -155,8 +155,8 @@ struct AddEditItemView: View { store.send(.favoriteChanged(!store.state.isFavoriteOn)) } label: { store.state.isFavoriteOn - ? Asset.Images.starFilled24.swiftUIImage - : Asset.Images.star24.swiftUIImage + ? SharedAsset.Icons.starFilled24.swiftUIImage + : SharedAsset.Icons.star24.swiftUIImage } .buttonStyle(.accessory) .accessibilityIdentifier("ItemFavoriteButton") @@ -237,7 +237,7 @@ private extension AddEditItemView { Button { openURL(ExternalLinksConstants.protectIndividualItems) } label: { - Asset.Images.questionCircle16.swiftUIImage + SharedAsset.Icons.questionCircle16.swiftUIImage } .accessibilityLabel(Localizations.masterPasswordRePromptHelp) .buttonStyle(.fieldLabelIcon) diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/AddEditLoginItemView.swift b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/AddEditLoginItemView.swift index 238914ad22..ef7063a4a6 100644 --- a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/AddEditLoginItemView.swift +++ b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/AddEditLoginItemView.swift @@ -60,7 +60,7 @@ struct AddEditLoginItemView: View { ) { if store.state.canViewPassword, store.state.editView { AccessoryButton( - asset: Asset.Images.minusCircle24, + asset: SharedAsset.Icons.minusCircle24, accessibilityLabel: Localizations.removePasskey ) { store.send(.removePasskeyPressed) @@ -88,7 +88,7 @@ struct AddEditLoginItemView: View { ) ) { if store.state.canViewPassword { - AccessoryButton(asset: Asset.Images.generate24, accessibilityLabel: Localizations.generatePassword) { + AccessoryButton(asset: SharedAsset.Icons.generate24, accessibilityLabel: Localizations.generatePassword) { store.send(.generatePasswordPressed) } .guidedTourStep(.step1) { frame in @@ -129,7 +129,7 @@ struct AddEditLoginItemView: View { ), trailingContent: { if !store.state.authenticatorKey.isEmpty { - AccessoryButton(asset: Asset.Images.copy24, accessibilityLabel: Localizations.copyTotp) { + AccessoryButton(asset: SharedAsset.Icons.copy24, accessibilityLabel: Localizations.copyTotp) { await store.perform(.copyTotpPressed) } } @@ -138,7 +138,7 @@ struct AddEditLoginItemView: View { AsyncButton { await store.perform(.setupTotpPressed) } label: { - Label(Localizations.setUpAuthenticatorKey, image: Asset.Images.camera16.swiftUIImage) + Label(Localizations.setUpAuthenticatorKey, image: SharedAsset.Icons.camera16.swiftUIImage) } .accessibilityIdentifier("SetupTotpButton") .buttonStyle(.bitwardenBorderless) @@ -192,7 +192,7 @@ struct AddEditLoginItemView: View { } } } label: { - Asset.Images.cog24.swiftUIImage + SharedAsset.Icons.cog24.swiftUIImage .imageStyle(.accessoryIcon24) } .accessibilityIdentifier("LoginUriOptionsButton") @@ -205,7 +205,7 @@ struct AddEditLoginItemView: View { store.send(.newUriPressed) } } label: { - Label(Localizations.addWebsite, image: Asset.Images.plus16.swiftUIImage) + Label(Localizations.addWebsite, image: SharedAsset.Icons.plus16.swiftUIImage) } .accessibilityIdentifier("LoginAddNewUriButton") .buttonStyle(.bitwardenBorderless) @@ -229,7 +229,7 @@ struct AddEditLoginItemView: View { accessibilityIdentifier: "LoginUsernameEntry" ) { AccessoryButton( - asset: Asset.Images.generate24, + asset: SharedAsset.Icons.generate24, accessibilityLabel: Localizations.generateUsername ) { store.send(.generateUsernamePressed) diff --git a/BitwardenShared/UI/Vault/VaultItem/Attachments/AttachmentsView.swift b/BitwardenShared/UI/Vault/VaultItem/Attachments/AttachmentsView.swift index 594bcf23f4..5850240410 100644 --- a/BitwardenShared/UI/Vault/VaultItem/Attachments/AttachmentsView.swift +++ b/BitwardenShared/UI/Vault/VaultItem/Attachments/AttachmentsView.swift @@ -132,7 +132,7 @@ struct AttachmentsView: View { Button { store.send(.deletePressed(attachment)) } label: { - Image(asset: Asset.Images.trash24) + Image(asset: SharedAsset.Icons.trash24) .imageStyle(.rowIcon(color: SharedAsset.Colors.iconSecondary.swiftUIColor)) } .accessibilityLabel(Localizations.delete) diff --git a/BitwardenShared/UI/Vault/VaultItem/CipherItemState.swift b/BitwardenShared/UI/Vault/VaultItem/CipherItemState.swift index 52cb72bf6d..7c3979fe30 100644 --- a/BitwardenShared/UI/Vault/VaultItem/CipherItemState.swift +++ b/BitwardenShared/UI/Vault/VaultItem/CipherItemState.swift @@ -477,21 +477,21 @@ extension CipherItemState: ViewVaultItemState { loginView } - var icon: ImageAsset { + var icon: SharedImageAsset { switch cipher.type { case .card: guard case let .custom(brand) = cardItemState.brand else { - return Asset.Images.card24 + return SharedAsset.Icons.card24 } return brand.icon case .identity: - return Asset.Images.idCard24 + return SharedAsset.Icons.idCard24 case .login: - return Asset.Images.globe24 + return SharedAsset.Icons.globe24 case .secureNote: - return Asset.Images.stickyNote24 + return SharedAsset.Icons.stickyNote24 case .sshKey: - return Asset.Images.key24 + return SharedAsset.Icons.key24 } } diff --git a/BitwardenShared/UI/Vault/VaultItem/CipherItemStateTests.swift b/BitwardenShared/UI/Vault/VaultItem/CipherItemStateTests.swift index eec1c3b70f..026ac4fe2c 100644 --- a/BitwardenShared/UI/Vault/VaultItem/CipherItemStateTests.swift +++ b/BitwardenShared/UI/Vault/VaultItem/CipherItemStateTests.swift @@ -312,49 +312,49 @@ class CipherItemStateTests: BitwardenTestCase { // swiftlint:disable:this type_b func test_icon_cardKnownBrand() throws { let cipher = CipherView.cardFixture(card: .fixture(brand: "Visa")) let state = try XCTUnwrap(CipherItemState(existing: cipher, hasPremium: true)) - XCTAssertEqual(state.icon.name, Asset.Images.Cards.visa.name) + XCTAssertEqual(state.icon.name, SharedAsset.Icons.Cards.visa.name) } /// `getter:icon` returns the icon for a card cipher with "other" brand. func test_icon_cardOtherBrand() throws { let cipher = CipherView.cardFixture(card: .fixture(brand: "Other")) let state = try XCTUnwrap(CipherItemState(existing: cipher, hasPremium: true)) - XCTAssertEqual(state.icon.name, Asset.Images.card24.name) + XCTAssertEqual(state.icon.name, SharedAsset.Icons.card24.name) } /// `getter:icon` returns the icon for a card cipher with no brand. func test_icon_cardNoBrand() throws { let cipher = CipherView.cardFixture(card: .fixture()) let state = try XCTUnwrap(CipherItemState(existing: cipher, hasPremium: true)) - XCTAssertEqual(state.icon.name, Asset.Images.card24.name) + XCTAssertEqual(state.icon.name, SharedAsset.Icons.card24.name) } /// `getter:icon` returns the icon for an identity cipher. func test_icon_identity() throws { let cipher = CipherView.fixture(type: .identity) let state = try XCTUnwrap(CipherItemState(existing: cipher, hasPremium: true)) - XCTAssertEqual(state.icon.name, Asset.Images.idCard24.name) + XCTAssertEqual(state.icon.name, SharedAsset.Icons.idCard24.name) } /// `getter:icon` returns the icon for a login cipher. func test_icon_login() throws { let cipher = CipherView.loginFixture(login: .fixture()) let state = try XCTUnwrap(CipherItemState(existing: cipher, hasPremium: true)) - XCTAssertEqual(state.icon.name, Asset.Images.globe24.name) + XCTAssertEqual(state.icon.name, SharedAsset.Icons.globe24.name) } /// `getter:icon` returns the icon for a secure note cipher. func test_icon_secureNote() throws { let cipher = CipherView.fixture(type: .secureNote) let state = try XCTUnwrap(CipherItemState(existing: cipher, hasPremium: true)) - XCTAssertEqual(state.icon.name, Asset.Images.stickyNote24.name) + XCTAssertEqual(state.icon.name, SharedAsset.Icons.stickyNote24.name) } /// `getter:icon` returns the icon for a SSH key cipher. func test_icon_sshKey() throws { let cipher = CipherView.fixture(type: .sshKey) let state = try XCTUnwrap(CipherItemState(existing: cipher, hasPremium: true)) - XCTAssertEqual(state.icon.name, Asset.Images.key24.name) + XCTAssertEqual(state.icon.name, SharedAsset.Icons.key24.name) } /// `getter:iconAccessibilityId` returns the icon accessibility id. diff --git a/BitwardenShared/UI/Vault/VaultItem/VaultItemManagementMenu/VaultItemManagementMenuView.swift b/BitwardenShared/UI/Vault/VaultItem/VaultItemManagementMenu/VaultItemManagementMenuView.swift index 82aecbef04..ef52b8ed3c 100644 --- a/BitwardenShared/UI/Vault/VaultItem/VaultItemManagementMenu/VaultItemManagementMenuView.swift +++ b/BitwardenShared/UI/Vault/VaultItem/VaultItemManagementMenu/VaultItemManagementMenuView.swift @@ -54,7 +54,7 @@ struct VaultItemManagementMenuView: View { } } } label: { - Image(asset: Asset.Images.ellipsisVertical24, label: Text(Localizations.options)) + Image(asset: SharedAsset.Icons.ellipsisVertical24, label: Text(Localizations.options)) .imageStyle(.toolbarIcon) } .accessibilityLabel(Localizations.options) diff --git a/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/ViewCardItemView.swift b/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/ViewCardItemView.swift index 1bd7026feb..4e0f6bff39 100644 --- a/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/ViewCardItemView.swift +++ b/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/ViewCardItemView.swift @@ -63,7 +63,7 @@ struct ViewCardItemView: View { Button { store.send(.copyPressed(value: number, field: .cardNumber)) } label: { - Asset.Images.copy24.swiftUIImage + SharedAsset.Icons.copy24.swiftUIImage .imageStyle(.accessoryIcon24) } .accessibilityLabel(Localizations.copy) @@ -120,7 +120,7 @@ struct ViewCardItemView: View { Button { store.send(.copyPressed(value: code, field: .securityCode)) } label: { - Asset.Images.copy24.swiftUIImage + SharedAsset.Icons.copy24.swiftUIImage .imageStyle(.accessoryIcon24) } .accessibilityLabel(Localizations.copy) diff --git a/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewItemDetailsView.swift b/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewItemDetailsView.swift index a4c15d5482..4a2f06a839 100644 --- a/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewItemDetailsView.swift +++ b/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewItemDetailsView.swift @@ -69,8 +69,8 @@ struct ViewItemDetailsView: View { // swiftlint:disable:this type_body_length if customField.type == .boolean { HStack(spacing: 16) { let image = customField.booleanValue - ? Asset.Images.checkSquare16.swiftUIImage - : Asset.Images.square16.swiftUIImage + ? SharedAsset.Icons.checkSquare16.swiftUIImage + : SharedAsset.Icons.square16.swiftUIImage image .imageStyle(.accessoryIcon16(color: SharedAsset.Colors.textSecondary.swiftUIColor)) @@ -106,7 +106,7 @@ struct ViewItemDetailsView: View { // swiftlint:disable:this type_body_length case .linked: if let linkedIdType = customField.linkedIdType { HStack(spacing: 8) { - Asset.Images.link16.swiftUIImage + SharedAsset.Icons.link16.swiftUIImage .imageStyle( .accessoryIcon16(color: SharedAsset.Colors.textSecondary.swiftUIColor) ) @@ -129,7 +129,7 @@ struct ViewItemDetailsView: View { // swiftlint:disable:this type_body_length Button { store.send(.copyPressed(value: value, field: .customHiddenField)) } label: { - Asset.Images.copy24.swiftUIImage + SharedAsset.Icons.copy24.swiftUIImage .imageStyle(.accessoryIcon24) } .accessibilityIdentifier("HiddenCustomFieldCopyValueButton") @@ -137,7 +137,7 @@ struct ViewItemDetailsView: View { // swiftlint:disable:this type_body_length Button { store.send(.copyPressed(value: value, field: .customTextField)) } label: { - Asset.Images.copy24.swiftUIImage + SharedAsset.Icons.copy24.swiftUIImage .imageStyle(.accessoryIcon24) } .accessibilityIdentifier("TextCustomFieldCopyValueButton") @@ -157,7 +157,7 @@ struct ViewItemDetailsView: View { // swiftlint:disable:this type_body_length VStack(alignment: .leading, spacing: 8) { if store.state.shouldDisplayNoFolder { belongingView( - icon: Asset.Images.folder16, + icon: SharedAsset.Icons.folder16, name: Localizations.folderNone ) .padding(.leading, 8) @@ -186,7 +186,7 @@ struct ViewItemDetailsView: View { // swiftlint:disable:this type_body_length VStack(alignment: .leading, spacing: 8) { if let organizationName = store.state.organizationName { belongingView( - icon: Asset.Images.business16, + icon: SharedAsset.Icons.business16, name: organizationName ) .accessibilityLabel(Localizations.ownerX(organizationName)) @@ -197,7 +197,7 @@ struct ViewItemDetailsView: View { // swiftlint:disable:this type_body_length ForEachIndexed(store.state.cipherCollectionsToDisplay) { index, collection in VStack(alignment: .leading, spacing: 0) { belongingView( - icon: Asset.Images.collections16, + icon: SharedAsset.Icons.collections16, name: collection.name ) .accessibilityLabel(Localizations.collectionX(collection.name)) @@ -212,7 +212,7 @@ struct ViewItemDetailsView: View { // swiftlint:disable:this type_body_length if store.state.shouldDisplayFolder, let folderName = store.state.folderName { belongingView( - icon: Asset.Images.folder16, + icon: SharedAsset.Icons.folder16, name: folderName ) .accessibilityLabel(Localizations.folderX(folderName)) @@ -259,8 +259,8 @@ struct ViewItemDetailsView: View { // swiftlint:disable:this type_body_length .frame(maxWidth: .infinity, alignment: .leading) let image = store.state.isFavoriteOn - ? Asset.Images.starFilled24.swiftUIImage - : Asset.Images.star24.swiftUIImage + ? SharedAsset.Icons.starFilled24.swiftUIImage + : SharedAsset.Icons.star24.swiftUIImage image .foregroundStyle(SharedAsset.Colors.iconPrimary.swiftUIColor) .accessibilityLabel(Localizations.favorite) @@ -405,7 +405,7 @@ struct ViewItemDetailsView: View { // swiftlint:disable:this type_body_length Button { openURL(url) } label: { - Asset.Images.externalLink24.swiftUIImage + SharedAsset.Icons.externalLink24.swiftUIImage .imageStyle(.accessoryIcon24) } .accessibilityLabel(Localizations.launch) @@ -414,7 +414,7 @@ struct ViewItemDetailsView: View { // swiftlint:disable:this type_body_length Button { store.send(.copyPressed(value: uri.uri, field: .uri)) } label: { - Asset.Images.copy24.swiftUIImage + SharedAsset.Icons.copy24.swiftUIImage .imageStyle(.accessoryIcon24) } .accessibilityLabel(Localizations.copy) @@ -456,7 +456,7 @@ struct ViewItemDetailsView: View { // swiftlint:disable:this type_body_length Button { store.send(.downloadAttachment(attachment)) } label: { - Image(asset: Asset.Images.download24) + Image(asset: SharedAsset.Icons.download24) .imageStyle(.rowIcon(color: SharedAsset.Colors.iconSecondary.swiftUIColor)) } .accessibilityLabel(Localizations.download) @@ -472,7 +472,7 @@ struct ViewItemDetailsView: View { // swiftlint:disable:this type_body_length /// - name: The name to display. /// - Returns: A view with an icon and a name stating where the item belongs to. @ViewBuilder - private func belongingView(icon: ImageAsset, name: String) -> some View { + private func belongingView(icon: SharedImageAsset, name: String) -> some View { HStack(alignment: .top) { Image(decorative: icon) .resizable() diff --git a/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewLoginItem/ViewLoginItemView.swift b/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewLoginItem/ViewLoginItemView.swift index b8c342cb7d..77e0e642d8 100644 --- a/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewLoginItem/ViewLoginItemView.swift +++ b/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewLoginItem/ViewLoginItemView.swift @@ -69,7 +69,7 @@ struct ViewLoginItemView: View { Button { store.send(.copyPressed(value: password, field: .password)) } label: { - Asset.Images.copy24.swiftUIImage + SharedAsset.Icons.copy24.swiftUIImage .imageStyle(.accessoryIcon24) } .accessibilityLabel(Localizations.copy) @@ -116,7 +116,7 @@ struct ViewLoginItemView: View { Button { store.send(.copyPressed(value: username, field: .username)) } label: { - Asset.Images.copy24.swiftUIImage + SharedAsset.Icons.copy24.swiftUIImage .imageStyle(.accessoryIcon24) } .accessibilityLabel(Localizations.copy) @@ -167,7 +167,7 @@ struct ViewLoginItemView: View { Button { store.send(.copyPressed(value: model.code, field: .totp)) } label: { - Asset.Images.copy24.swiftUIImage + SharedAsset.Icons.copy24.swiftUIImage .imageStyle(.accessoryIcon24) } .accessibilityLabel(Localizations.copy) diff --git a/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewSSHKeyItemView/ViewSSHKeyItemView.swift b/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewSSHKeyItemView/ViewSSHKeyItemView.swift index 9f6c834fc8..be1996f6c6 100644 --- a/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewSSHKeyItemView/ViewSSHKeyItemView.swift +++ b/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewSSHKeyItemView/ViewSSHKeyItemView.swift @@ -46,7 +46,7 @@ struct ViewSSHKeyItemView: View { Button { store.send(.copyPressed(value: privateKey, field: .sshPrivateKey)) } label: { - Asset.Images.copy24.swiftUIImage + SharedAsset.Icons.copy24.swiftUIImage .imageStyle(.accessoryIcon24) } .accessibilityLabel(Localizations.copy) @@ -70,7 +70,7 @@ struct ViewSSHKeyItemView: View { Button { store.send(.copyPressed(value: publicKey, field: .sshPublicKey)) } label: { - Asset.Images.copy24.swiftUIImage + SharedAsset.Icons.copy24.swiftUIImage .imageStyle(.accessoryIcon24) } .accessibilityLabel(Localizations.copy) @@ -93,7 +93,7 @@ struct ViewSSHKeyItemView: View { Button { store.send(.copyPressed(value: keyFingerprint, field: .sshKeyFingerprint)) } label: { - Asset.Images.copy24.swiftUIImage + SharedAsset.Icons.copy24.swiftUIImage .imageStyle(.accessoryIcon24) } .accessibilityLabel(Localizations.copy) diff --git a/BitwardenShared/UI/Vault/Views/VaultItemDecorativeImageView.swift b/BitwardenShared/UI/Vault/Views/VaultItemDecorativeImageView.swift index d30ab53ecb..72f3930e69 100644 --- a/BitwardenShared/UI/Vault/Views/VaultItemDecorativeImageView.swift +++ b/BitwardenShared/UI/Vault/Views/VaultItemDecorativeImageView.swift @@ -1,3 +1,4 @@ +import BitwardenResources import SwiftUI // MARK: - VaultItemDecorativeImageView @@ -17,7 +18,7 @@ struct VaultItemDecorativeImageView: View { let showWebIcons: Bool /// The placeholder content to build from the icon asset. - let placeholderContent: ((ImageAsset) -> PlaceholderContent)? + let placeholderContent: ((SharedImageAsset) -> PlaceholderContent)? var body: some View { // The Group is needed so `.accessibilityHidden(false)` can be applied to this image wrapper. @@ -60,7 +61,7 @@ struct VaultItemDecorativeImageView: View { item: VaultItemWithDecorativeIcon, iconBaseURL: URL?, showWebIcons: Bool, - placeholderContent: ((ImageAsset) -> PlaceholderContent)? = nil + placeholderContent: ((SharedImageAsset) -> PlaceholderContent)? = nil ) { self.item = item self.iconBaseURL = iconBaseURL @@ -75,7 +76,7 @@ struct VaultItemDecorativeImageView: View { /// - Parameter icon: The icon to use in the placeholder view. /// - Returns: The placeholder view. @ViewBuilder - private func placeholder(_ icon: ImageAsset) -> some View { + private func placeholder(_ icon: SharedImageAsset) -> some View { if item.shouldUseCustomPlaceholderContent, let placeholderContent { placeholderContent(icon) } else { @@ -84,7 +85,7 @@ struct VaultItemDecorativeImageView: View { } /// The placeholder image for the decorative image. - private func placeholderDecorativeImage(_ icon: ImageAsset) -> some View { + private func placeholderDecorativeImage(_ icon: SharedImageAsset) -> some View { Image(decorative: icon) .resizable() .scaledToFit() diff --git a/BitwardenShared/UI/Vault/Views/VaultListItemRow/VaultListItemRowView.swift b/BitwardenShared/UI/Vault/Views/VaultListItemRow/VaultListItemRowView.swift index 2aed93ea81..968f5accf5 100644 --- a/BitwardenShared/UI/Vault/Views/VaultListItemRow/VaultListItemRowView.swift +++ b/BitwardenShared/UI/Vault/Views/VaultListItemRow/VaultListItemRowView.swift @@ -38,7 +38,7 @@ struct VaultListItemRowView: View { .accessibilityIdentifier("CipherNameLabel") if cipherItem.organizationId != nil { - Asset.Images.collections16.swiftUIImage + SharedAsset.Icons.collections16.swiftUIImage .imageStyle(.accessoryIcon16( color: SharedAsset.Colors.textSecondary.swiftUIColor, scaleWithFont: true @@ -48,7 +48,7 @@ struct VaultListItemRowView: View { } if cipherItem.attachments > 0 { - Asset.Images.paperclip16.swiftUIImage + SharedAsset.Icons.paperclip16.swiftUIImage .imageStyle(.accessoryIcon16( color: SharedAsset.Colors.textSecondary.swiftUIColor, scaleWithFont: true @@ -83,7 +83,7 @@ struct VaultListItemRowView: View { AsyncButton { await store.perform(.morePressed) } label: { - Asset.Images.ellipsisHorizontal24.swiftUIImage + SharedAsset.Icons.ellipsisHorizontal24.swiftUIImage .imageStyle(.rowIcon) } .accessibilityLabel(Localizations.more) @@ -155,7 +155,7 @@ struct VaultListItemRowView: View { Button { store.send(.copyTOTPCode(model.totpCode.code)) } label: { - Asset.Images.copy24.swiftUIImage + SharedAsset.Icons.copy24.swiftUIImage } .foregroundColor(SharedAsset.Colors.iconPrimary.swiftUIColor) .accessibilityLabel(Localizations.copyTotp) diff --git a/swiftgen-bwr.yml b/swiftgen-bwr.yml index 24b3e33eb3..6b6ab0e8ea 100644 --- a/swiftgen-bwr.yml +++ b/swiftgen-bwr.yml @@ -19,10 +19,12 @@ strings: xcassets: inputs: - BitwardenResources/Colors.xcassets + - BitwardenResources/Icons.xcassets outputs: - templateName: swift5 output: SharedAssets.swift params: enumName: SharedAsset forceFileNameEnum: true + imageTypeName: SharedImageAsset publicAccess: true