finish updates to wallet selector improvements
This commit is contained in:
Benjamin Hakes
@@ -20,14 +20,14 @@ struct InvoiceView: View {
|
||||
var PayButton: some View {
|
||||
Button {
|
||||
inv = invoice.string
|
||||
if (user_settings.showwalletselector){
|
||||
if (user_settings.showWalletSelector){
|
||||
showingSelectWallet = true
|
||||
} else {
|
||||
let wallet = get_default_wallet(user_settings.defaultwallet.rawValue)
|
||||
if let url = URL(string: "\(wallet.link)\(inv)"), UIApplication.shared.canOpenURL(url) {
|
||||
let walletModel = user_settings.defaultWallet.model
|
||||
if let url = URL(string: "\(walletModel.link)\(inv)"), UIApplication.shared.canOpenURL(url) {
|
||||
openURL(url)
|
||||
} else {
|
||||
if let url = URL(string: wallet.appStoreLink), UIApplication.shared.canOpenURL(url) {
|
||||
if let url = URL(string: walletModel.appStoreLink), UIApplication.shared.canOpenURL(url) {
|
||||
openURL(url)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,124 +0,0 @@
|
||||
//
|
||||
// UserSettings.swift
|
||||
// damus
|
||||
//
|
||||
// Created by Suhail Saqan on 12/29/22.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
struct WalletItem : Decodable, Identifiable, Hashable {
|
||||
var id: Int
|
||||
var tag: String
|
||||
var name : String
|
||||
var link : String
|
||||
var appStoreLink : String
|
||||
var image: String
|
||||
}
|
||||
|
||||
// New url prefixes needed to be added to LSApplicationQueriesSchemes
|
||||
enum Wallet: String, CaseIterable {
|
||||
case defaultwallet = """
|
||||
{"id": -1, "tag": "defaultwallet", "name": "Local default", "link": "lightning:", "appStoreLink": "lightning:", "image": ""}
|
||||
"""
|
||||
case strike = """
|
||||
{"id": 0, "tag": "strike", "name": "Strike", "link": "strike:", "appStoreLink": "https://apps.apple.com/us/app/strike-bitcoin-payments/id1488724463", "image": "strike"}
|
||||
"""
|
||||
case cashapp = """
|
||||
{"id": 1, "tag": "cashapp", "name": "Cash App", "link": "squarecash://", "appStoreLink": "https://apps.apple.com/us/app/cash-app/id711923939", "image": "cashapp"}
|
||||
"""
|
||||
case muun = """
|
||||
{"id": 2, "tag": "muun", "name": "Muun", "link": "muun:", "appStoreLink": "https://apps.apple.com/us/app/muun-wallet/id1482037683", "image": "muun"}
|
||||
"""
|
||||
case bluewallet = """
|
||||
{"id": 3, "tag": "bluewallet", "name": "Blue Wallet", "link": "bluewallet:lightning:", "appStoreLink": "https://apps.apple.com/us/app/bluewallet-bitcoin-wallet/id1376878040", "image": "bluewallet"}
|
||||
"""
|
||||
case walletofsatoshi = """
|
||||
{"id": 4, "tag": "walletofsatoshi", "name": "Wallet Of Satoshi", "link": "walletofsatoshi:lightning:", "appStoreLink": "https://apps.apple.com/us/app/wallet-of-satoshi/id1438599608", "image": "walletofsatoshi"}
|
||||
"""
|
||||
case zebedee = """
|
||||
{"id": 5, "tag": "zebedee", "name": "Zebedee", "link": "zebedee:lightning:", "appStoreLink": "https://apps.apple.com/us/app/zebedee-wallet/id1484394401", "image": "zebedee"}
|
||||
"""
|
||||
case zeusln = """
|
||||
{"id": 6, "tag": "zeusln", "name": "Zeus LN", "link": "zeusln:lightning:", "appStoreLink": "https://apps.apple.com/us/app/zeus-ln/id1456038895", "image": "zeusln"}
|
||||
"""
|
||||
case lnlink = """
|
||||
{"id": 7, "tag": "lnlink", "name": "LNLink", "link": "lnlink:lightning:", "appStoreLink": "https://testflight.apple.com/join/aNY4yuuZ", "image": "lnlink"}
|
||||
"""
|
||||
case phoenix = """
|
||||
{"id": 8, "tag": "phoenix", "name": "Phoenix", "link": "phoenix://", "appStoreLink": "https://apps.apple.com/us/app/phoenix-wallet/id1544097028", "image": "phoenix"}
|
||||
"""
|
||||
}
|
||||
|
||||
class UserSettingsStore: ObservableObject {
|
||||
@Published var defaultwallet: Wallet {
|
||||
didSet {
|
||||
UserDefaults.standard.set(defaultwallet.rawValue, forKey: "defaultwallet")
|
||||
}
|
||||
}
|
||||
|
||||
@Published var showwalletselector: Bool {
|
||||
didSet {
|
||||
UserDefaults.standard.set(showwalletselector, forKey: "showwalletselector")
|
||||
}
|
||||
}
|
||||
|
||||
init() {
|
||||
self.defaultwallet = (UserDefaults.standard.object(forKey: "defaultwallet") == nil ? Wallet.defaultwallet : Wallet(rawValue: UserDefaults.standard.object(forKey: "defaultwallet") as! String)) ?? Wallet.defaultwallet
|
||||
self.showwalletselector = UserDefaults.standard.object(forKey: "showwalletselector") == nil ? true : UserDefaults.standard.object(forKey: "showwalletselector") as! Bool
|
||||
}
|
||||
}
|
||||
|
||||
func get_wallet_list() -> [WalletItem] {
|
||||
let values: [String] = Wallet.allCases.map { $0.rawValue }
|
||||
|
||||
var walletList: [WalletItem] = []
|
||||
|
||||
for value in values {
|
||||
let data = value.data(using: .utf8)!
|
||||
do {
|
||||
let wallet = try JSONDecoder().decode(WalletItem.self, from: data)
|
||||
walletList.append(wallet)
|
||||
} catch {
|
||||
return []
|
||||
}
|
||||
}
|
||||
return walletList
|
||||
}
|
||||
|
||||
func get_wallet_tag(_ tag: String) -> Wallet {
|
||||
switch tag {
|
||||
case "defaultwallet":
|
||||
return Wallet.defaultwallet
|
||||
case "strike":
|
||||
return Wallet.strike
|
||||
case "cashapp":
|
||||
return Wallet.cashapp
|
||||
case "muun":
|
||||
return Wallet.muun
|
||||
case "bluewallet":
|
||||
return Wallet.bluewallet
|
||||
case "walletofsatoshi":
|
||||
return Wallet.walletofsatoshi
|
||||
case "zebedee":
|
||||
return Wallet.zebedee
|
||||
case "zeusln":
|
||||
return Wallet.zeusln
|
||||
case "lnlink":
|
||||
return Wallet.lnlink
|
||||
case "phoenix":
|
||||
return Wallet.phoenix
|
||||
default:
|
||||
return Wallet.defaultwallet
|
||||
}
|
||||
}
|
||||
|
||||
func get_default_wallet(_ us: String) -> WalletItem {
|
||||
let data = us.data(using: .utf8)!
|
||||
do {
|
||||
return try JSONDecoder().decode(WalletItem.self, from: data)
|
||||
} catch {
|
||||
return get_wallet_list()[0]
|
||||
}
|
||||
|
||||
}
|
||||
81
damus/Models/UserSettingsStore.swift
Normal file
81
damus/Models/UserSettingsStore.swift
Normal file
@@ -0,0 +1,81 @@
|
||||
//
|
||||
// UserSettingsStore.swift
|
||||
// damus
|
||||
//
|
||||
// Created by Suhail Saqan on 12/29/22.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
class UserSettingsStore: ObservableObject {
|
||||
@Published var defaultWallet: Wallet {
|
||||
didSet {
|
||||
UserDefaults.standard.set(defaultWallet.rawValue, forKey: "systemdefaultwallet")
|
||||
}
|
||||
}
|
||||
|
||||
@Published var showWalletSelector: Bool {
|
||||
didSet {
|
||||
UserDefaults.standard.set(showWalletSelector, forKey: "showwalletselector")
|
||||
}
|
||||
}
|
||||
|
||||
init() {
|
||||
self.defaultWallet = UserDefaults.standard.object(forKey: "defaultwallet") as? Wallet ?? .systemdefaultwallet
|
||||
self.showWalletSelector = UserDefaults.standard.object(forKey: "showwalletselector") as? Bool ?? true
|
||||
}
|
||||
}
|
||||
//
|
||||
//func get_wallet_list() -> [WalletItem] {
|
||||
// let values: [String] = Wallet.allCases.map { $0.rawValue }
|
||||
//
|
||||
// var walletList: [WalletItem] = []
|
||||
//
|
||||
// for value in values {
|
||||
// let data = value.data(using: .utf8)!
|
||||
// do {
|
||||
// let wallet = try JSONDecoder().decode(WalletItem.self, from: data)
|
||||
// walletList.append(wallet)
|
||||
// } catch {
|
||||
// return []
|
||||
// }
|
||||
// }
|
||||
// return walletList
|
||||
//}
|
||||
|
||||
//func get_wallet_tag(_ tag: String) -> Wallet {
|
||||
// switch tag {
|
||||
// case "defaultwallet":
|
||||
// return Wallet.defaultwallet
|
||||
// case "strike":
|
||||
// return Wallet.strike
|
||||
// case "cashapp":
|
||||
// return Wallet.cashapp
|
||||
// case "muun":
|
||||
// return Wallet.muun
|
||||
// case "bluewallet":
|
||||
// return Wallet.bluewallet
|
||||
// case "walletofsatoshi":
|
||||
// return Wallet.walletofsatoshi
|
||||
// case "zebedee":
|
||||
// return Wallet.zebedee
|
||||
// case "zeusln":
|
||||
// return Wallet.zeusln
|
||||
// case "lnlink":
|
||||
// return Wallet.lnlink
|
||||
// case "phoenix":
|
||||
// return Wallet.phoenix
|
||||
// default:
|
||||
// return Wallet.defaultwallet
|
||||
// }
|
||||
//}
|
||||
|
||||
//func get_default_wallet(_ us: String) -> WalletItem {
|
||||
// let data = us.data(using: .utf8)!
|
||||
// do {
|
||||
// return try JSONDecoder().decode(WalletItem.self, from: data)
|
||||
// } catch {
|
||||
// return get_wallet_list()[0]
|
||||
// }
|
||||
//
|
||||
//}
|
||||
71
damus/Models/Wallet.swift
Normal file
71
damus/Models/Wallet.swift
Normal file
@@ -0,0 +1,71 @@
|
||||
//
|
||||
// Wallet.swift
|
||||
// damus
|
||||
//
|
||||
// Created by Benjamin Hakes on 12/29/22.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
// New url prefixes needed to be added to LSApplicationQueriesSchemes
|
||||
enum Wallet: String, CaseIterable {
|
||||
|
||||
struct Model: Identifiable, Hashable {
|
||||
var id: String { self.tag }
|
||||
var index: Int
|
||||
var tag: String
|
||||
var displayName : String
|
||||
var link : String
|
||||
var appStoreLink : String
|
||||
var image: String
|
||||
}
|
||||
|
||||
case systemdefaultwallet
|
||||
case strike
|
||||
case cashapp
|
||||
case muun
|
||||
case bluewallet
|
||||
case walletofsatoshi
|
||||
case zebedee
|
||||
case zeusln
|
||||
case lnlink
|
||||
case phoenix
|
||||
|
||||
var model: Model {
|
||||
switch self {
|
||||
case .systemdefaultwallet:
|
||||
return .init(index: -1, tag: "systemdefaultwallet", displayName: "Local default",
|
||||
link: "lightning:", appStoreLink: "lightning:", image: "")
|
||||
case .strike:
|
||||
return .init(index: 0, tag: "strike", displayName: "Strike", link: "strike:",
|
||||
appStoreLink: "https://apps.apple.com/us/app/strike-bitcoin-payments/id1488724463", image: "strike")
|
||||
case .cashapp:
|
||||
return .init(index: 1, tag: "cashapp", displayName: "Cash App", link: "squarecash://",
|
||||
appStoreLink: "https://apps.apple.com/us/app/cash-app/id711923939", image: "cashapp")
|
||||
case .muun:
|
||||
return .init(index: 2, tag: "muun", displayName: "Muun", link: "muun:", appStoreLink: "https://apps.apple.com/us/app/muun-wallet/id1482037683", image: "muun")
|
||||
case .bluewallet:
|
||||
return .init(index: 3, tag: "bluewallet", displayName: "Blue Wallet", link: "bluewallet:lightning:",
|
||||
appStoreLink: "https://apps.apple.com/us/app/bluewallet-bitcoin-wallet/id1376878040", image: "bluewallet")
|
||||
case .walletofsatoshi:
|
||||
return .init(index: 4, tag: "walletofsatoshi", displayName: "Wallet Of Satoshi", link: "walletofsatoshi:lightning:",
|
||||
appStoreLink: "https://apps.apple.com/us/app/wallet-of-satoshi/id1438599608", image: "walletofsatoshi")
|
||||
case .zebedee:
|
||||
return .init(index: 5, tag: "zebedee", displayName: "Zebedee", link: "zebedee:lightning:",
|
||||
appStoreLink: "https://apps.apple.com/us/app/zebedee-wallet/id1484394401", image: "zebedee")
|
||||
case .zeusln:
|
||||
return .init(index: 6, tag: "zeusln", displayName: "Zeus LN", link: "zeusln:lightning:",
|
||||
appStoreLink: "https://apps.apple.com/us/app/zeus-ln/id1456038895", image: "zeusln")
|
||||
case .lnlink:
|
||||
return .init(index: 7, tag: "lnlink", displayName: "LNLink", link: "lnlink:lightning:",
|
||||
appStoreLink: "https://testflight.apple.com/join/aNY4yuuZ", image: "lnlink")
|
||||
case .phoenix:
|
||||
return .init(index: 8, tag: "phoenix", displayName: "Phoenix", link: "phoenix://",
|
||||
appStoreLink: "https://apps.apple.com/us/app/phoenix-wallet/id1544097028", image: "phoenix")
|
||||
}
|
||||
}
|
||||
|
||||
static var allModels: [Model] {
|
||||
return Self.allCases.map { $0.model }
|
||||
}
|
||||
}
|
||||
@@ -19,7 +19,7 @@ struct ConfigView: View {
|
||||
@State var pubkey_copied: Bool = false
|
||||
@EnvironmentObject var user_settings: UserSettingsStore
|
||||
|
||||
let walletItems: [WalletItem] = get_wallet_list()
|
||||
@State var walletModels: [Wallet.Model] = Wallet.allModels
|
||||
|
||||
let generator = UIImpactFeedbackGenerator(style: .light)
|
||||
|
||||
@@ -82,14 +82,13 @@ struct ConfigView: View {
|
||||
}
|
||||
|
||||
Section("Wallet Selector") {
|
||||
Toggle("Show wallet selector", isOn: $user_settings.showwalletselector).toggleStyle(.switch)
|
||||
if walletItems != [] {
|
||||
Picker(selection: $user_settings.defaultwallet, label: Text("Select default wallet"), content: {
|
||||
ForEach(walletItems, id: \.self) { wallet in
|
||||
Text(wallet.name).tag(get_wallet_tag(wallet.tag))
|
||||
}
|
||||
})
|
||||
}
|
||||
Toggle("Show wallet selector", isOn: $user_settings.showWalletSelector).toggleStyle(.switch)
|
||||
Picker(selection: $user_settings.defaultWallet, label: Text("Select default wallet"), content: {
|
||||
List($walletModels) { $wallet in
|
||||
Text(wallet.displayName)
|
||||
.tag(wallet.tag)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
Section("Reset") {
|
||||
|
||||
@@ -150,7 +150,8 @@ struct ProfileView: View {
|
||||
}
|
||||
}
|
||||
}.sheet(isPresented: $showingSelectWallet, onDismiss: {showingSelectWallet = false}) {
|
||||
SelectWalletView(showingSelectWallet: $showingSelectWallet, invoice: $inv).environmentObject(user_settings)
|
||||
SelectWalletView(showingSelectWallet: $showingSelectWallet, invoice: $inv)
|
||||
.environmentObject(user_settings)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -14,8 +14,8 @@ struct SelectWalletView: View {
|
||||
@State var invoice_copied: Bool = false
|
||||
@EnvironmentObject var user_settings: UserSettingsStore
|
||||
|
||||
@State var allWalletModels: [Wallet.Model] = Wallet.allModels
|
||||
let generator = UIImpactFeedbackGenerator(style: .light)
|
||||
let walletItems: [WalletItem] = get_wallet_list()
|
||||
|
||||
var body: some View {
|
||||
NavigationView {
|
||||
@@ -35,42 +35,42 @@ struct SelectWalletView: View {
|
||||
generator.impactOccurred()
|
||||
}
|
||||
}
|
||||
Section("Select a lightning wallet"){
|
||||
List{
|
||||
Button() {
|
||||
let wallet = get_default_wallet(user_settings.defaultwallet.rawValue)
|
||||
if let url = URL(string: "\(wallet.link)\(invoice)"), UIApplication.shared.canOpenURL(url) {
|
||||
Section("Select a lightning wallet"){
|
||||
List{
|
||||
Button() {
|
||||
let walletModel = user_settings.defaultWallet.model
|
||||
if let url = URL(string: "\(walletModel.link)\(invoice)"), UIApplication.shared.canOpenURL(url) {
|
||||
openURL(url)
|
||||
} else {
|
||||
if let url = URL(string: walletModel.appStoreLink), UIApplication.shared.canOpenURL(url) {
|
||||
openURL(url)
|
||||
} else {
|
||||
if let url = URL(string: wallet.appStoreLink), UIApplication.shared.canOpenURL(url) {
|
||||
openURL(url)
|
||||
}
|
||||
}
|
||||
} label: {
|
||||
HStack {
|
||||
Text("Default Wallet").font(.body).foregroundColor(.blue)
|
||||
}
|
||||
}.buttonStyle(.plain)
|
||||
ForEach(walletItems, id: \.self) { wallet in
|
||||
if (wallet.id >= 0){
|
||||
Button() {
|
||||
if let url = URL(string: "\(wallet.link)\(invoice)"), UIApplication.shared.canOpenURL(url) {
|
||||
openURL(url)
|
||||
} else {
|
||||
if let url = URL(string: wallet.appStoreLink), UIApplication.shared.canOpenURL(url) {
|
||||
openURL(url)
|
||||
}
|
||||
}
|
||||
} label: {
|
||||
HStack {
|
||||
Image(wallet.image).resizable().frame(width: 32.0, height: 32.0,alignment: .center).cornerRadius(5)
|
||||
Text(wallet.name).font(.body)
|
||||
}
|
||||
}.buttonStyle(.plain)
|
||||
}
|
||||
}
|
||||
}.padding(.vertical, 2.5)
|
||||
}
|
||||
} label: {
|
||||
HStack {
|
||||
Text("Default Wallet").font(.body).foregroundColor(.blue)
|
||||
}
|
||||
}.buttonStyle(.plain)
|
||||
List($allWalletModels) { $wallet in
|
||||
if wallet.index >= 0 {
|
||||
Button() {
|
||||
if let url = URL(string: "\(wallet.link)\(invoice)"), UIApplication.shared.canOpenURL(url) {
|
||||
openURL(url)
|
||||
} else {
|
||||
if let url = URL(string: wallet.appStoreLink), UIApplication.shared.canOpenURL(url) {
|
||||
openURL(url)
|
||||
}
|
||||
}
|
||||
} label: {
|
||||
HStack {
|
||||
Image(wallet.image).resizable().frame(width: 32.0, height: 32.0,alignment: .center).cornerRadius(5)
|
||||
Text(wallet.displayName).font(.body)
|
||||
}
|
||||
}.buttonStyle(.plain)
|
||||
}
|
||||
}
|
||||
}.padding(.vertical, 2.5)
|
||||
}
|
||||
}.navigationBarTitle(Text("Pay the lightning invoice"), displayMode: .inline).navigationBarItems(trailing: Button(action: {
|
||||
self.showingSelectWallet = false
|
||||
}) {
|
||||
|
||||
Reference in New Issue
Block a user