Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

icon: update icon images #81

Merged
merged 6 commits into from
Sep 4, 2023
Merged

icon: update icon images #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b29b1b1
icons
reez Sep 4, 2023
cc94841
add satoshi
reez Sep 4, 2023
d6d55d0
update preview
reez Sep 4, 2023
afaf202
rename
reez Sep 4, 2023
9c0a39b
image
reez Sep 4, 2023
9979d0e
colors
reez Sep 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified Docs/colors-dark.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed Docs/hardware-dark.png
View file
Open in desktop
Binary file not shown.
Binary file added Docs/icon-dark.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ The design system in BitcoinUI includes:
<img src='https://github.com/reez/BitcoinUI/blob/main/Docs/text-dark.png?raw=true' height='200' alt='text-code-preview' />
</a>
<a href='https://github.com/GBKS/bitcoin-hardware-illustrations'>
<img src='https://github.com/reez/BitcoinUI/blob/main/Docs/hardware-dark.png?raw=true' height='200' alt='hardware-illustrations-code-preview' />
<img src='https://github.com/reez/BitcoinUI/blob/main/Docs/icon-dark.png?raw=true' height='200' alt='hardware-illustrations-code-preview' />
</a>
</p>

Expand Down
4 changes: 4 additions & 0 deletions Sources/BitcoinUI/Colors.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,8 @@ struct ColorsView: View {
.padding(.vertical, .wallet_grid_vertical_20())
.padding(.top, .wallet_grid_vertical_20())
.padding(.top, .wallet_grid_vertical_20())

Spacer()

HStack {
ColorView(color: .bitcoinWhite, colorLabel: "White")
Expand Down Expand Up @@ -434,6 +436,8 @@ struct ColorsView: View {
}
.padding(.horizontal, .wallet_grid_horizontal_10())
.padding(.vertical, .wallet_grid_vertical_20())

Spacer()

}
.padding(.horizontal, .wallet_grid_horizontal_10())
Expand Down
145 changes: 4 additions & 141 deletions Sources/BitcoinUI/Images.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@ struct IconView: View {
}
}

struct HardwareIllustrationsView: View {
struct IconsView: View {
var body: some View {

ZStack {
Color(UIColor.systemBackground)

VStack {
Text("Hardware Illustrations")
Text("Images")
.underline()
.font(.largeTitle)
.fontWeight(.semibold)
Expand All @@ -77,23 +77,20 @@ struct HardwareIllustrationsView: View {
HStack {
IconView(named: "bitbox")
IconView(named: "blockstream-jade")
IconView(named: "cardwallet")
IconView(named: "cobo-vault")
}
.padding(.horizontal, .wallet_grid_horizontal_10())
.padding(.vertical, .wallet_grid_vertical_20())

HStack {
IconView(named: "coldcard")
IconView(named: "cypherwheel")
IconView(named: "foundation-passport")
IconView(named: "generic-hardware-wallet")
}
.padding(.horizontal, .wallet_grid_horizontal_10())
.padding(.vertical, .wallet_grid_vertical_20())

HStack {
IconView(named: "generic-paper-wallet")
IconView(named: "keepkey")
IconView(named: "ledger-nano")
IconView(named: "opendime")
Expand All @@ -102,7 +99,6 @@ struct HardwareIllustrationsView: View {
.padding(.vertical, .wallet_grid_vertical_20())

HStack {
IconView(named: "satochip")
IconView(named: "seedplate")
IconView(named: "trezor-model-t")
IconView(named: "trezor-one")
Expand All @@ -120,146 +116,13 @@ struct HardwareIllustrationsView: View {
}
}

struct BitcoinIconsFilledView: View {
var body: some View {

ZStack {
Color(UIColor.systemBackground)

VStack {
Text("Icons Filled")
.underline()
.font(.largeTitle)
.fontWeight(.semibold)
.padding(.horizontal, .wallet_grid_horizontal_10())
.padding(.vertical, .wallet_grid_vertical_20())
.padding(.top, .wallet_grid_vertical_20())
.padding(.top, .wallet_grid_vertical_20())

HStack {
IconView(named: "bitcoin-circle-filled")
IconView(named: "bitcoin-filled")
IconView(named: "block-filled")
IconView(named: "devices-filled")
}
.padding(.horizontal, .wallet_grid_horizontal_10())
.padding(.vertical, .wallet_grid_vertical_20())

HStack {
IconView(named: "key-filled")
IconView(named: "lightning-filled")
IconView(named: "mining-filled")
IconView(named: "mnemonic-filled")
}
.padding(.horizontal, .wallet_grid_horizontal_10())
.padding(.vertical, .wallet_grid_vertical_20())

HStack {
IconView(named: "node-1-connection-filled")
IconView(named: "node-2-connections-filled")
IconView(named: "node-3-connections-filled")
IconView(named: "node-filled")
}
.padding(.horizontal, .wallet_grid_horizontal_10())
.padding(.vertical, .wallet_grid_vertical_20())

HStack {
IconView(named: "node-hardware-filled")
IconView(named: "two-keys-filled")
IconView(named: "wallet-filled")
IconView(named: "")
}
.padding(.horizontal, .wallet_grid_horizontal_10())
.padding(.vertical, .wallet_grid_vertical_20())

}
.padding(.horizontal, .wallet_grid_horizontal_10())
.padding(.vertical, .wallet_grid_vertical_20())

}
.edgesIgnoringSafeArea(.all)

}
}

struct BitcoinIconsOutlineView: View {
var body: some View {

ZStack {
Color(UIColor.systemBackground)

VStack {
Text("Icons Outline")
.underline()
.font(.largeTitle)
.fontWeight(.semibold)
.padding(.horizontal, .wallet_grid_horizontal_10())
.padding(.vertical, .wallet_grid_vertical_20())
.padding(.top, .wallet_grid_vertical_20())
.padding(.top, .wallet_grid_vertical_20())

HStack {
IconView(named: "bitcoin-circle-outline")
IconView(named: "bitcoin-outline")
IconView(named: "block-outline")
IconView(named: "devices-outline")
}
.padding(.horizontal, .wallet_grid_horizontal_10())
.padding(.vertical, .wallet_grid_vertical_20())

HStack {
IconView(named: "key-outline")
IconView(named: "lightning-outline")
IconView(named: "mining-outline")
IconView(named: "mnemonic-outline")
}
.padding(.horizontal, .wallet_grid_horizontal_10())
.padding(.vertical, .wallet_grid_vertical_20())

HStack {
IconView(named: "node-1-connection-outline")
IconView(named: "node-2-connections-outline")
IconView(named: "node-3-connections-outline")
IconView(named: "node-outline")
}
.padding(.horizontal, .wallet_grid_horizontal_10())
.padding(.vertical, .wallet_grid_vertical_20())

HStack {
IconView(named: "node-hardware-outline")
IconView(named: "two-keys-outline")
IconView(named: "wallet-outline")
IconView(named: "")
}
.padding(.horizontal, .wallet_grid_horizontal_10())
.padding(.vertical, .wallet_grid_vertical_20())

}
.padding(.horizontal, .wallet_grid_horizontal_10())
.padding(.vertical, .wallet_grid_vertical_20())

}
.edgesIgnoringSafeArea(.all)

}
}

struct IconsView_Previews: PreviewProvider {
static var previews: some View {
Group {
HardwareIllustrationsView()
IconsView()
.environment(\.colorScheme, .light)
HardwareIllustrationsView()
.environment(\.colorScheme, .dark)
BitcoinIconsFilledView()
.environment(\.colorScheme, .light)
BitcoinIconsFilledView()
.environment(\.colorScheme, .dark)
BitcoinIconsOutlineView()
.environment(\.colorScheme, .light)
BitcoinIconsOutlineView()
IconsView()
.environment(\.colorScheme, .dark)
}

}
}
24 changes: 0 additions & 24 deletions Sources/BitcoinUI/Images.xcassets/bitcoin-circle-filled.imageset/Contents.json
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions ...ces/BitcoinUI/Images.xcassets/bitcoin-circle-filled.imageset/bitcoin-circle.svg
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions Sources/BitcoinUI/Images.xcassets/bitcoin-circle-outline.imageset/Contents.json
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions ...es/BitcoinUI/Images.xcassets/bitcoin-circle-outline.imageset/bitcoin-circle.svg
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions Sources/BitcoinUI/Images.xcassets/bitcoin-filled.imageset/Contents.json
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions Sources/BitcoinUI/Images.xcassets/bitcoin-filled.imageset/bitcoin.svg
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions Sources/BitcoinUI/Images.xcassets/bitcoin-outline.imageset/Contents.json
View file
Open in desktop

This file was deleted.

Loading
Loading