Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
3e0ba36
Move icons to BWR
KatherineInCode Sep 25, 2025
1df01d9
Replace references
KatherineInCode Sep 25, 2025
63e9a82
Imports
KatherineInCode Sep 25, 2025
035cd3c
ImageAssetChange
KatherineInCode Sep 26, 2025
85cede1
Get to build
KatherineInCode Sep 26, 2025
89fa6a6
BWA camera
KatherineInCode Sep 29, 2025
8f2a1fb
BWA hidden
KatherineInCode Sep 29, 2025
ed67d1c
BWA visible
KatherineInCode Sep 29, 2025
68b779b
BWA Copy
KatherineInCode Sep 29, 2025
bfbc59f
BWA trash
KatherineInCode Sep 29, 2025
990c421
BWA vertical-kebob
KatherineInCode Sep 29, 2025
21f3600
BWA horizontal kebob
KatherineInCode Sep 29, 2025
f3723b6
BWA gear
KatherineInCode Sep 29, 2025
a87aa30
BWA gear-filled
KatherineInCode Sep 29, 2025
62cb8de
BWA paperclip
KatherineInCode Sep 29, 2025
4628ee8
BWA credit card
KatherineInCode Sep 29, 2025
cd86f71
BWA pencil and logo
KatherineInCode Sep 29, 2025
991b6fb
BWA bwi-provider
KatherineInCode Sep 29, 2025
6427c26
Circle round
KatherineInCode Sep 29, 2025
4d9bed5
BWA cancel
KatherineInCode Sep 29, 2025
fad2d41
BWA check
KatherineInCode Sep 29, 2025
8f6f2ec
BWA chevron down
KatherineInCode Sep 29, 2025
b514dfd
BWA clock
KatherineInCode Sep 29, 2025
04eb511
BWA collections
KatherineInCode Sep 29, 2025
0e52e8f
BWA doc
KatherineInCode Sep 29, 2025
db3e8a5
BWA down angle
KatherineInCode Sep 29, 2025
3ea6f2e
BWA external link
KatherineInCode Sep 29, 2025
81d287a
BWA folder closed
KatherineInCode Sep 29, 2025
c2eea82
BWA id
KatherineInCode Sep 29, 2025
41beecc
BWA locked magnifying glass plus
KatherineInCode Sep 29, 2025
46554d0
BWA right angle
KatherineInCode Sep 29, 2025
3b0f618
BWA up angle
KatherineInCode Sep 29, 2025
b2e21e1
BWA globe
KatherineInCode Sep 29, 2025
007b1d2
BWA icons
KatherineInCode Sep 29, 2025
28eade2
Merge branch 'main' into pm-26184/consolidate-icons
KatherineInCode Sep 29, 2025
5f106c3
Merge branch 'main' into pm-26184/consolidate-icons
KatherineInCode Sep 30, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import BitwardenResources
import SwiftUI

// MARK: - AccessoryButtonStyle
Expand Down Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand All @@ -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")
}

Expand All @@ -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")
}

Expand All @@ -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)
Expand Down Expand Up @@ -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")
}
Expand Down

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Loading