From 2253a1bb975b1f2c31146f0fb63ac90495ec0cb0 Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Thu, 20 Feb 2025 17:04:56 +0200 Subject: [PATCH] add support for onekey pro and classic 1s hardware wallets --- drongo | 2 +- lark | 2 +- .../sparrow/control/UsbStatusButton.java | 3 ++- src/main/resources/image/onekey-icon-invert.svg | 9 +++++++++ src/main/resources/image/onekey-icon.svg | 9 +++++++++ src/main/resources/image/onekey.png | Bin 0 -> 1242 bytes src/main/resources/image/onekey@2x.png | Bin 0 -> 2411 bytes src/main/resources/image/onekey@3x.png | Bin 0 -> 5379 bytes 8 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/image/onekey-icon-invert.svg create mode 100644 src/main/resources/image/onekey-icon.svg create mode 100644 src/main/resources/image/onekey.png create mode 100644 src/main/resources/image/onekey@2x.png create mode 100644 src/main/resources/image/onekey@3x.png diff --git a/drongo b/drongo index 42968028..5fd8e941 160000 --- a/drongo +++ b/drongo @@ -1 +1 @@ -Subproject commit 42968028ccfed85c0b6396a7bc090be564c6b1dd +Subproject commit 5fd8e9416a81d71df1b2fe60fdea2f8264335800 diff --git a/lark b/lark index 7088ce72..b41e83a0 160000 --- a/lark +++ b/lark @@ -1 +1 @@ -Subproject commit 7088ce7294cbd8a3f5b217f9243c56cecb54265e +Subproject commit b41e83a0029f50c3ab3d85a075204797bc6d6ccd diff --git a/src/main/java/com/sparrowwallet/sparrow/control/UsbStatusButton.java b/src/main/java/com/sparrowwallet/sparrow/control/UsbStatusButton.java index bedb042a..7376cbb8 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/UsbStatusButton.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/UsbStatusButton.java @@ -28,7 +28,8 @@ public class UsbStatusButton extends MenuButton { for(Device device : devices) { MenuItem deviceItem = new MenuItem(device.getModel().toDisplayString()); if(!device.isNeedsPinSent() && (device.getModel() == WalletModel.TREZOR_1 || device.getModel() == WalletModel.TREZOR_T || device.getModel() == WalletModel.TREZOR_SAFE_3 || - device.getModel() == WalletModel.TREZOR_SAFE_5 || device.getModel() == WalletModel.KEEPKEY || device.getModel() == WalletModel.BITBOX_02)) { + device.getModel() == WalletModel.TREZOR_SAFE_5 || device.getModel() == WalletModel.KEEPKEY || device.getModel() == WalletModel.BITBOX_02 || + device.getModel() == WalletModel.ONEKEY_CLASSIC_1S || device.getModel() == WalletModel.ONEKEY_PRO)) { deviceItem = new Menu(device.getModel().toDisplayString()); MenuItem toggleItem = new MenuItem("Toggle Passphrase" + (!device.getModel().externalPassphraseEntry() ? "" : (device.isNeedsPassphraseSent() ? " Off" : " On"))); toggleItem.setOnAction(event -> { diff --git a/src/main/resources/image/onekey-icon-invert.svg b/src/main/resources/image/onekey-icon-invert.svg new file mode 100644 index 00000000..fc7c707e --- /dev/null +++ b/src/main/resources/image/onekey-icon-invert.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/main/resources/image/onekey-icon.svg b/src/main/resources/image/onekey-icon.svg new file mode 100644 index 00000000..3161f046 --- /dev/null +++ b/src/main/resources/image/onekey-icon.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/main/resources/image/onekey.png b/src/main/resources/image/onekey.png new file mode 100644 index 0000000000000000000000000000000000000000..6f059ab38e62d7378ded975df3ad18981fe1d827 GIT binary patch literal 1242 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/image/onekey@3x.png b/src/main/resources/image/onekey@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..d6c33312830dd54ad953c5ae3b4378a02df18719 GIT binary patch literal 5379 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 LI!aXvHj)1WIJ&}e literal 0 HcmV?d00001