lukechilds
/
damus
mirror of https://github.com/lukechilds/damus.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

make wallet items a List

post-button-style
Suhail Saqan 2 years ago
parent
21db49b6dd
commit
ed9e60ffb6
No known key found for this signature in database GPG Key ID: C3E8D33BFD16C6E6
5 changed files with 55 additions and 74 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      damus.xcodeproj/project.pbxproj
  2. 21
      damus/Assets.xcassets/breez.imageset/Contents.json
  3. BIN
      damus/Assets.xcassets/breez.imageset/breez.png
  4. 11
      damus/Util/Constants.swift
  5. 43
      damus/Views/SelectWalletView.swift

4
damus.xcodeproj/project.pbxproj
View File

@ -1025,7 +1025,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_ASSET_PATHS = "\"damus/Preview Content\"";
DEVELOPMENT_TEAM = XK7H4JAB3D;
DEVELOPMENT_TEAM = XL4476DR2X;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = damus/Info.plist;
@ -1064,7 +1064,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_ASSET_PATHS = "\"damus/Preview Content\"";
DEVELOPMENT_TEAM = XK7H4JAB3D;
DEVELOPMENT_TEAM = XL4476DR2X;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = damus/Info.plist;

21
damus/Assets.xcassets/breez.imageset/Contents.json
View File

@ -1,21 +0,0 @@
{
"images" : [
{
"filename" : "breez.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
damus/Assets.xcassets/breez.imageset/breez.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.7 KiB

11
damus/Util/Constants.swift
View File

@ -25,14 +25,13 @@ public class Constants {
static let WALLETS = """
[
{"id": 0, "name": "Strike", "link": "strike:lightning", "appStoreLink": "https://apps.apple.com/us/app/strike-bitcoin-payments/id1488724463", "image": "strike"},
{"id": 0, "name": "Strike", "link": "strike:", "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"},
{"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": "Zebedee", "link": "zebedee:lightning:", "appStoreLink": "https://apps.apple.com/us/app/zebedee-wallet/id1484394401", "image": "zebedee"},
{"id": 6, "name": "Zeus LN", "link": "zeusln:lightning:", "appStoreLink": "https://apps.apple.com/us/app/zeus-ln/id1456038895", "image": "zeusln"},
]
""".data(using: .utf8)!
}

43
damus/Views/SelectWalletView.swift
View File

@ -7,7 +7,7 @@
import SwiftUI
struct WalletItem : Decodable, Identifiable {
struct WalletItem : Decodable, Identifiable, Hashable {
var id: Int
var name : String
var link : String
@ -36,8 +36,7 @@ struct SelectWalletView: View {
.padding([.bottom, .top], 8)
HStack {
Text(invoice).font(.body)
.multilineTextAlignment(.center)
.lineLimit(3)
.lineLimit(2)
.truncationMode(.tail)
Image(systemName: self.invoice_copied ? "checkmark.circle" : "doc.on.doc")
@ -48,19 +47,10 @@ struct SelectWalletView: View {
generator.impactOccurred()
}
Spacer()
Text("Select a lightning wallet")
.bold()
.font(.title3)
.multilineTextAlignment(.center)
.padding([.bottom], 8)
ForEach(walletItems) { wallet in
HStack(spacing: 20) {
Image(wallet.image)
.resizable()
.frame(width: 32.0, height: 32.0,alignment: .center)
.cornerRadius(5)
Text("\(wallet.name)")
}.onTapGesture {
List {
Section{
ForEach(walletItems, id: \.self) { wallet in
Button() {
if let url = URL(string: "\(wallet.link)\(invoice)"), UIApplication.shared.canOpenURL(url) {
openURL(url)
} else {
@ -68,12 +58,26 @@ struct SelectWalletView: View {
openURL(url)
}
}
} label: {
HStack {
Image(wallet.image).resizable().frame(width: 32.0, height: 32.0,alignment: .center).cornerRadius(5)
Text(wallet.name).font(.body)
.lineLimit(2)
.truncationMode(.tail)
}.padding([.bottom], 4)
}.buttonStyle(.plain)
wallet.id != 6 ? Divider().padding([.bottom], -6) : nil
}
} header: {
Text("Select a lightning wallet")
.bold()
.font(.title3)
.multilineTextAlignment(.center)
.padding([.bottom, .top], 8)
}
Divider()
}
}
.navigationBarTitle(Text("Pay the lightning invoice"), displayMode: .inline)
.navigationBarItems(trailing: Button(action: {
}.navigationBarTitle(Text("Pay the lightning invoice"), displayMode: .inline).navigationBarItems(trailing: Button(action: {
self.show_select_wallet = false
}) {
Text("Done").bold()
@ -81,7 +85,6 @@ struct SelectWalletView: View {
}
}
}
}
struct SelectWalletView_Previews: PreviewProvider {
@State static var show: Bool = true

Write Preview
Loading…
Cancel
Save