diff --git a/damus/Assets.xcassets/bluewallet.imageset/Contents.json b/damus/Assets.xcassets/bluewallet.imageset/Contents.json new file mode 100644 index 0000000..8a56483 --- /dev/null +++ b/damus/Assets.xcassets/bluewallet.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "bluewallet.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/damus/Assets.xcassets/bluewallet.imageset/bluewallet.png b/damus/Assets.xcassets/bluewallet.imageset/bluewallet.png new file mode 100644 index 0000000..d6e3268 Binary files /dev/null and b/damus/Assets.xcassets/bluewallet.imageset/bluewallet.png differ diff --git a/damus/Assets.xcassets/breez.imageset/Contents.json b/damus/Assets.xcassets/breez.imageset/Contents.json new file mode 100644 index 0000000..d07c6ec --- /dev/null +++ b/damus/Assets.xcassets/breez.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "breez.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/damus/Assets.xcassets/breez.imageset/breez.png b/damus/Assets.xcassets/breez.imageset/breez.png new file mode 100644 index 0000000..710c4cd Binary files /dev/null and b/damus/Assets.xcassets/breez.imageset/breez.png differ diff --git a/damus/Assets.xcassets/cashapp.imageset/Contents.json b/damus/Assets.xcassets/cashapp.imageset/Contents.json new file mode 100644 index 0000000..bd570d5 --- /dev/null +++ b/damus/Assets.xcassets/cashapp.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "cashapp.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/damus/Assets.xcassets/cashapp.imageset/cashapp.png b/damus/Assets.xcassets/cashapp.imageset/cashapp.png new file mode 100644 index 0000000..da042f7 Binary files /dev/null and b/damus/Assets.xcassets/cashapp.imageset/cashapp.png differ diff --git a/damus/Assets.xcassets/muun.imageset/Contents.json b/damus/Assets.xcassets/muun.imageset/Contents.json new file mode 100644 index 0000000..e02c1ba --- /dev/null +++ b/damus/Assets.xcassets/muun.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "muun.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/damus/Assets.xcassets/muun.imageset/muun.png b/damus/Assets.xcassets/muun.imageset/muun.png new file mode 100644 index 0000000..3c16961 Binary files /dev/null and b/damus/Assets.xcassets/muun.imageset/muun.png differ diff --git a/damus/Assets.xcassets/strike.imageset/Contents.json b/damus/Assets.xcassets/strike.imageset/Contents.json new file mode 100644 index 0000000..3c05f9f --- /dev/null +++ b/damus/Assets.xcassets/strike.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "strike.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/damus/Assets.xcassets/strike.imageset/strike.png b/damus/Assets.xcassets/strike.imageset/strike.png new file mode 100644 index 0000000..4531d16 Binary files /dev/null and b/damus/Assets.xcassets/strike.imageset/strike.png differ diff --git a/damus/Assets.xcassets/walletofsatoshi.imageset/Contents.json b/damus/Assets.xcassets/walletofsatoshi.imageset/Contents.json new file mode 100644 index 0000000..1ddd11e --- /dev/null +++ b/damus/Assets.xcassets/walletofsatoshi.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "walletofsatoshi.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/damus/Assets.xcassets/walletofsatoshi.imageset/walletofsatoshi.png b/damus/Assets.xcassets/walletofsatoshi.imageset/walletofsatoshi.png new file mode 100644 index 0000000..937c8f0 Binary files /dev/null and b/damus/Assets.xcassets/walletofsatoshi.imageset/walletofsatoshi.png differ diff --git a/damus/Assets.xcassets/zebedee.imageset/Contents.json b/damus/Assets.xcassets/zebedee.imageset/Contents.json new file mode 100644 index 0000000..0c4c1f0 --- /dev/null +++ b/damus/Assets.xcassets/zebedee.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "zebedee.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/damus/Assets.xcassets/zebedee.imageset/zebedee.png b/damus/Assets.xcassets/zebedee.imageset/zebedee.png new file mode 100644 index 0000000..7903ae3 Binary files /dev/null and b/damus/Assets.xcassets/zebedee.imageset/zebedee.png differ diff --git a/damus/Assets.xcassets/zeusln.imageset/Contents.json b/damus/Assets.xcassets/zeusln.imageset/Contents.json new file mode 100644 index 0000000..301c442 --- /dev/null +++ b/damus/Assets.xcassets/zeusln.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "zeus.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/damus/Assets.xcassets/zeusln.imageset/zeus.png b/damus/Assets.xcassets/zeusln.imageset/zeus.png new file mode 100644 index 0000000..a074cc9 Binary files /dev/null and b/damus/Assets.xcassets/zeusln.imageset/zeus.png differ diff --git a/damus/Util/Constants.swift b/damus/Util/Constants.swift index 3f4dba3..c5c21d3 100644 --- a/damus/Util/Constants.swift +++ b/damus/Util/Constants.swift @@ -25,14 +25,14 @@ public class Constants { static let WALLETS = """ [ - {"id": 0, "name": "Strike", "link": "strike:lightning", "appStoreLink": "https://apps.apple.com/us/app/strike-bitcoin-payments/id1488724463"}, - {"id": 1, "name": "Cash App", "link": "squarecash://", "appStoreLink": "https://apps.apple.com/us/app/cash-app/id711923939"}, - {"id": 2, "name": "Muun", "link": "muun:", "appStoreLink": "https://apps.apple.com/us/app/muun-wallet/id1482037683"}, - {"id": 3, "name": "Blue Wallet", "link": "bluewallet:lightning", "appStoreLink": "https://apps.apple.com/us/app/bluewallet-bitcoin-wallet/id1376878040"}, - {"id": 4, "name": "Wallet Of Satoshi", "link": "walletofsatoshi:lightning", "appStoreLink": "https://apps.apple.com/us/app/wallet-of-satoshi/id1438599608"}, - {"id": 5, "name": "Breez", "link": "breez:lightning", "appStoreLink": "https://testflight.apple.com/join/wPju2Du7"}, - {"id": 6, "name": "Zebedee", "link": "zebedee:lightning", "appStoreLink": "https://apps.apple.com/us/app/zebedee-wallet/id1484394401"}, - {"id": 7, "name": "Zeus LN", "link": "zeusln:lightning", "appStoreLink": "https://apps.apple.com/us/app/zeus-ln/id1456038895"}, + {"id": 0, "name": "Strike", "link": "strike:lightning", "appStoreLink": "https://apps.apple.com/us/app/strike-bitcoin-payments/id1488724463", "image": "strike"}, + {"id": 1, "name": "Cash App", "link": "squarecash://", "appStoreLink": "https://apps.apple.com/us/app/cash-app/id711923939", "image": "cashapp"}, + {"id": 2, "name": "Muun", "link": "muun:", "appStoreLink": "https://apps.apple.com/us/app/muun-wallet/id1482037683", "image": "muun"}, + {"id": 3, "name": "Blue Wallet", "link": "bluewallet:lightning", "appStoreLink": "https://apps.apple.com/us/app/bluewallet-bitcoin-wallet/id1376878040", "image": "bluewallet"}, + {"id": 4, "name": "Wallet Of Satoshi", "link": "walletofsatoshi:lightning", "appStoreLink": "https://apps.apple.com/us/app/wallet-of-satoshi/id1438599608", "image": "walletofsatoshi"}, + {"id": 5, "name": "Breez", "link": "breez:lightning", "appStoreLink": "https://testflight.apple.com/join/wPju2Du7", "image": "breez"}, + {"id": 6, "name": "Zebedee", "link": "zebedee:lightning", "appStoreLink": "https://apps.apple.com/us/app/zebedee-wallet/id1484394401", "image": "zebedee"}, + {"id": 7, "name": "Zeus LN", "link": "zeusln:lightning", "appStoreLink": "https://apps.apple.com/us/app/zeus-ln/id1456038895", "image": "zeusln"}, ] """.data(using: .utf8)! } diff --git a/damus/Views/SelectWalletView.swift b/damus/Views/SelectWalletView.swift index a2e4c31..5932291 100644 --- a/damus/Views/SelectWalletView.swift +++ b/damus/Views/SelectWalletView.swift @@ -12,6 +12,7 @@ struct WalletItem : Decodable, Identifiable { var name : String var link : String var appStoreLink : String + var image: String } struct SelectWalletView: View { @@ -25,6 +26,11 @@ struct SelectWalletView: View { VStack(alignment: .leading) { ForEach(walletItems) { wallet in HStack(spacing: 20) { + Image(wallet.image) + .resizable() + .scaledToFit() + .aspectRatio(contentMode: .fit) + .cornerRadius(5) Button("\(wallet.name)"){ if let url = URL(string: "\(wallet.link)\(invoice)"), UIApplication.shared.canOpenURL(url) { openURL(url)