Skip to content

Commit b2db00f

Browse files
authored
ui: settings views
1 parent ede53bf commit b2db00f

28 files changed

+1128
-1335
lines changed

LDKNodeMonday.xcodeproj/project.pbxproj

+15-23
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
AE49E8642A2537B3002623E8 /* PeersListViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE49E8632A2537B3002623E8 /* PeersListViewModel.swift */; };
4949
AE49E8662A2537D5002623E8 /* PeerViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE49E8652A2537D5002623E8 /* PeerViewModel.swift */; };
5050
AE49E8682A2537FB002623E8 /* DisconnectViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE49E8672A2537FB002623E8 /* DisconnectViewModel.swift */; };
51-
AE49E86C2A253A32002623E8 /* NodeIDViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE49E86B2A253A32002623E8 /* NodeIDViewModel.swift */; };
51+
AE49E86C2A253A32002623E8 /* SettingsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE49E86B2A253A32002623E8 /* SettingsViewModel.swift */; };
5252
AE4C15B22A1316D100AA8917 /* BitcoinView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE4C15B12A1316D100AA8917 /* BitcoinView.swift */; };
5353
AE51BEFA2B37A2A500BAE452 /* Event+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE51BEF92B37A2A500BAE452 /* Event+Extensions.swift */; };
5454
AE51BEFD2B37A5DC00BAE452 /* SimpleToast in Frameworks */ = {isa = PBXBuildFile; productRef = AE51BEFC2B37A5DC00BAE452 /* SimpleToast */; };
@@ -66,7 +66,7 @@
6666
AE7C4A0C2B40785F0061189D /* SeedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE7C4A0B2B40785F0061189D /* SeedView.swift */; };
6767
AE7D3FAB2A4263AE00EAE730 /* PaymentsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE7D3FAA2A4263AE00EAE730 /* PaymentsView.swift */; };
6868
AE7D3FAD2A4263C100EAE730 /* PaymentsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE7D3FAC2A4263C100EAE730 /* PaymentsViewModel.swift */; };
69-
AE80116B29A59976009B9967 /* NodeIDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE80116A29A59976009B9967 /* NodeIDView.swift */; };
69+
AE80116B29A59976009B9967 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE80116A29A59976009B9967 /* SettingsView.swift */; };
7070
AE80116D29A59AF4009B9967 /* ChannelAddView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE80116C29A59AF4009B9967 /* ChannelAddView.swift */; };
7171
AE80C2002C4AB360006E7193 /* BIP21View.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE80C1FF2C4AB360006E7193 /* BIP21View.swift */; };
7272
AE80C2022C4AB38D006E7193 /* BIP21ViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE80C2012C4AB38D006E7193 /* BIP21ViewModel.swift */; };
@@ -76,7 +76,7 @@
7676
AEBAA4832A01A80A0042EA82 /* PeersListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEBAA4822A01A80A0042EA82 /* PeersListView.swift */; };
7777
AEBAA48D2A01A93B0042EA82 /* PeerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEBAA48C2A01A93B0042EA82 /* PeerView.swift */; };
7878
AEBAA4922A01C34A0042EA82 /* ChannelDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEBAA4912A01C34A0042EA82 /* ChannelDetailView.swift */; };
79-
AEBAA4942A01C6BD0042EA82 /* DisconnectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEBAA4932A01C6BD0042EA82 /* DisconnectView.swift */; };
79+
AEBAA4942A01C6BD0042EA82 /* PeerDetailsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEBAA4932A01C6BD0042EA82 /* PeerDetailsView.swift */; };
8080
AEBFD8B02B8A97DB0024E3F7 /* LightningServiceProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEBFD8AF2B8A97DB0024E3F7 /* LightningServiceProvider.swift */; };
8181
AEBFD8B22B8ABF7C0024E3F7 /* AmountView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEBFD8B12B8ABF7C0024E3F7 /* AmountView.swift */; };
8282
AEBFD8B62B8BABC00024E3F7 /* ReceiveView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEBFD8B52B8BABC00024E3F7 /* ReceiveView.swift */; };
@@ -131,7 +131,7 @@
131131
AE49E8632A2537B3002623E8 /* PeersListViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PeersListViewModel.swift; sourceTree = "<group>"; };
132132
AE49E8652A2537D5002623E8 /* PeerViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PeerViewModel.swift; sourceTree = "<group>"; };
133133
AE49E8672A2537FB002623E8 /* DisconnectViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisconnectViewModel.swift; sourceTree = "<group>"; };
134-
AE49E86B2A253A32002623E8 /* NodeIDViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NodeIDViewModel.swift; sourceTree = "<group>"; };
134+
AE49E86B2A253A32002623E8 /* SettingsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewModel.swift; sourceTree = "<group>"; };
135135
AE4C15B12A1316D100AA8917 /* BitcoinView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BitcoinView.swift; sourceTree = "<group>"; };
136136
AE51BEF92B37A2A500BAE452 /* Event+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Event+Extensions.swift"; sourceTree = "<group>"; };
137137
AE551D462B8ECE7D0034B61E /* Payment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Payment.swift; sourceTree = "<group>"; };
@@ -147,7 +147,7 @@
147147
AE7C4A0B2B40785F0061189D /* SeedView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SeedView.swift; sourceTree = "<group>"; };
148148
AE7D3FAA2A4263AE00EAE730 /* PaymentsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentsView.swift; sourceTree = "<group>"; };
149149
AE7D3FAC2A4263C100EAE730 /* PaymentsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentsViewModel.swift; sourceTree = "<group>"; };
150-
AE80116A29A59976009B9967 /* NodeIDView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NodeIDView.swift; sourceTree = "<group>"; };
150+
AE80116A29A59976009B9967 /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
151151
AE80116C29A59AF4009B9967 /* ChannelAddView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChannelAddView.swift; sourceTree = "<group>"; };
152152
AE80C1FF2C4AB360006E7193 /* BIP21View.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BIP21View.swift; sourceTree = "<group>"; };
153153
AE80C2012C4AB38D006E7193 /* BIP21ViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BIP21ViewModel.swift; sourceTree = "<group>"; };
@@ -157,7 +157,7 @@
157157
AEBAA4822A01A80A0042EA82 /* PeersListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PeersListView.swift; sourceTree = "<group>"; };
158158
AEBAA48C2A01A93B0042EA82 /* PeerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PeerView.swift; sourceTree = "<group>"; };
159159
AEBAA4912A01C34A0042EA82 /* ChannelDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChannelDetailView.swift; sourceTree = "<group>"; };
160-
AEBAA4932A01C6BD0042EA82 /* DisconnectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisconnectView.swift; sourceTree = "<group>"; };
160+
AEBAA4932A01C6BD0042EA82 /* PeerDetailsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PeerDetailsView.swift; sourceTree = "<group>"; };
161161
AEBFD8AF2B8A97DB0024E3F7 /* LightningServiceProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LightningServiceProvider.swift; sourceTree = "<group>"; };
162162
AEBFD8B12B8ABF7C0024E3F7 /* AmountView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AmountView.swift; sourceTree = "<group>"; };
163163
AEBFD8B52B8BABC00024E3F7 /* ReceiveView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReceiveView.swift; sourceTree = "<group>"; };
@@ -345,7 +345,7 @@
345345
AE49E87B2A2544E1002623E8 /* Profile */ = {
346346
isa = PBXGroup;
347347
children = (
348-
AE49E86B2A253A32002623E8 /* NodeIDViewModel.swift */,
348+
AE49E86B2A253A32002623E8 /* SettingsViewModel.swift */,
349349
AE49E8742A253AF0002623E8 /* Peer */,
350350
AE49E86D2A253A9A002623E8 /* Channel */,
351351
AE551D442B8ECD980034B61E /* Danger */,
@@ -386,7 +386,7 @@
386386
children = (
387387
AEBAA4822A01A80A0042EA82 /* PeersListView.swift */,
388388
AEBAA48C2A01A93B0042EA82 /* PeerView.swift */,
389-
AEBAA4932A01C6BD0042EA82 /* DisconnectView.swift */,
389+
AEBAA4932A01C6BD0042EA82 /* PeerDetailsView.swift */,
390390
);
391391
path = Peers;
392392
sourceTree = "<group>";
@@ -458,20 +458,20 @@
458458
isa = PBXGroup;
459459
children = (
460460
AE49E8772A253CBE002623E8 /* Home */,
461-
AE8549FE2AC6014F00F056E6 /* Profile */,
461+
AE8549FE2AC6014F00F056E6 /* Settings */,
462462
);
463463
path = View;
464464
sourceTree = "<group>";
465465
};
466-
AE8549FE2AC6014F00F056E6 /* Profile */ = {
466+
AE8549FE2AC6014F00F056E6 /* Settings */ = {
467467
isa = PBXGroup;
468468
children = (
469-
AE80116A29A59976009B9967 /* NodeIDView.swift */,
469+
AE80116A29A59976009B9967 /* SettingsView.swift */,
470470
AE551D432B8ECCAD0034B61E /* Peers */,
471471
AE49E86E2A253AAE002623E8 /* Channel */,
472472
AE49E87A2A2544DC002623E8 /* Danger */,
473473
);
474-
path = Profile;
474+
path = Settings;
475475
sourceTree = "<group>";
476476
};
477477
AE8549FF2AC601CD00F056E6 /* App */ = {
@@ -635,7 +635,7 @@
635635
AE028A2E2B9638EC00B336E7 /* FileManager+Extensions.swift in Sources */,
636636
AE49E8662A2537D5002623E8 /* PeerViewModel.swift in Sources */,
637637
AE33D3AE2C7BD0EE00AF562B /* URL+Extensions.swift in Sources */,
638-
AEBAA4942A01C6BD0042EA82 /* DisconnectView.swift in Sources */,
638+
AEBAA4942A01C6BD0042EA82 /* PeerDetailsView.swift in Sources */,
639639
65A406632D070CBD00EA331E /* NetworkSettingsView.swift in Sources */,
640640
AE49E8682A2537FB002623E8 /* DisconnectViewModel.swift in Sources */,
641641
AE94226A2A007D6C007E4F12 /* ChannelsListView.swift in Sources */,
@@ -647,7 +647,7 @@
647647
AE7096332B5C20480038BE56 /* PriceService.swift in Sources */,
648648
AEDF76022B5C6863002DDEE1 /* Optional+Extensions.swift in Sources */,
649649
AE7096382B5C208A0038BE56 /* Price.swift in Sources */,
650-
AE49E86C2A253A32002623E8 /* NodeIDViewModel.swift in Sources */,
650+
AE49E86C2A253A32002623E8 /* SettingsViewModel.swift in Sources */,
651651
AEBAA48D2A01A93B0042EA82 /* PeerView.swift in Sources */,
652652
AE028A242B96316B00B336E7 /* ReceiveOption.swift in Sources */,
653653
AEDF76062B5C68A0002DDEE1 /* ChannelDetailsFormatted.swift in Sources */,
@@ -683,7 +683,7 @@
683683
AE80116D29A59AF4009B9967 /* ChannelAddView.swift in Sources */,
684684
AE551D472B8ECE7D0034B61E /* Payment.swift in Sources */,
685685
AE51BEFA2B37A2A500BAE452 /* Event+Extensions.swift in Sources */,
686-
AE80116B29A59976009B9967 /* NodeIDView.swift in Sources */,
686+
AE80116B29A59976009B9967 /* SettingsView.swift in Sources */,
687687
AE49E8522A253618002623E8 /* StartViewModel.swift in Sources */,
688688
AE4C15B22A1316D100AA8917 /* BitcoinView.swift in Sources */,
689689
AEE5B76A2A09C722001E5E59 /* Peer.swift in Sources */,
@@ -944,14 +944,6 @@
944944
version = 2.0.0;
945945
};
946946
};
947-
AEFA825C2CC15C7C0095B0BA /* XCRemoteSwiftPackageReference "ldk-node" */ = {
948-
isa = XCRemoteSwiftPackageReference;
949-
repositoryURL = "https://github.com/lightningdevkit/ldk-node.git";
950-
requirement = {
951-
kind = exactVersion;
952-
version = 0.4.2;
953-
};
954-
};
955947
/* End XCRemoteSwiftPackageReference section */
956948

957949
/* Begin XCSwiftPackageProductDependency section */

LDKNodeMonday/Service/Lightning Service/LightningNodeService.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class LightningNodeService {
2424
let storedNetworkString = try! keyService.getNetwork() ?? Network.signet.description
2525
let storedEsploraURL =
2626
try! keyService.getEsploraURL()
27-
?? EsploraServer.lqwd_signet.url
27+
?? EsploraServer.lqwd_signet.url
2828

2929
self.network = Network(stringValue: storedNetworkString) ?? .signet
3030
self.keyService = keyService

LDKNodeMonday/Utilities/Constants.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ struct Constants {
2828
static let allValues = [
2929
EsploraServer.mutiny_signet,
3030
EsploraServer.bdk_signet,
31-
EsploraServer.lqwd_signet
31+
EsploraServer.lqwd_signet,
3232
]
3333
}
3434
struct Testnet {

LDKNodeMonday/View Model/Profile/Channel/ChannelAddViewModel.swift

-8
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ class ChannelAddViewModel: ObservableObject {
1212
@Published var address: String = ""
1313
@Published var channelAmountSats: String = ""
1414
@Published var channelAddViewError: MondayError?
15-
@Published var networkColor = Color.gray
1615
@Published var nodeId: PublicKey = ""
1716
@Published var isOpenChannelFinished: Bool = false
1817
@Published var isProgressViewShowing: Bool = false
@@ -67,11 +66,4 @@ class ChannelAddViewModel: ObservableObject {
6766
}
6867
}
6968

70-
func getColor() {
71-
let color = LightningNodeService.shared.networkColor
72-
DispatchQueue.main.async {
73-
self.networkColor = color
74-
}
75-
}
76-
7769
}

LDKNodeMonday/View Model/Profile/Channel/ChannelDetailViewModel.swift

-8
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import SwiftUI
1111
class ChannelDetailViewModel: ObservableObject {
1212
@Published var channel: ChannelDetails
1313
@Published var channelDetailViewError: MondayError?
14-
@Published var networkColor = Color.gray
1514

1615
init(channel: ChannelDetails) {
1716
self.channel = channel
@@ -42,11 +41,4 @@ class ChannelDetailViewModel: ObservableObject {
4241
}
4342
}
4443

45-
func getColor() {
46-
let color = LightningNodeService.shared.networkColor
47-
DispatchQueue.main.async {
48-
self.networkColor = color
49-
}
50-
}
51-
5244
}

LDKNodeMonday/View Model/Profile/Channel/ChannelsListViewModel.swift

-8
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ class ChannelsListViewModel {
1515
var channelsListViewError: MondayError?
1616
var aliases = [String: String]()
1717
var channels: [ChannelDetails] = []
18-
var networkColor = Color.gray
1918

2019
init(nodeInfoClient: NodeInfoClient) {
2120
self.nodeInfoClient = nodeInfoClient
@@ -50,11 +49,4 @@ class ChannelsListViewModel {
5049
}
5150
}
5251

53-
func getColor() {
54-
let color = LightningNodeService.shared.networkColor
55-
DispatchQueue.main.async {
56-
self.networkColor = color
57-
}
58-
}
59-
6052
}

LDKNodeMonday/View Model/Profile/Danger/SeedViewModel.swift

-8
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import SwiftUI
1111

1212
class SeedViewModel: ObservableObject {
1313
@Published var seed: BackupInfo = .init(mnemonic: "mock seed words")
14-
@Published var networkColor = Color.gray
1514
@Published var seedViewError: MondayError?
1615

1716
func getSeed() {
@@ -33,11 +32,4 @@ class SeedViewModel: ObservableObject {
3332
}
3433
}
3534

36-
func getColor() {
37-
let color = LightningNodeService.shared.networkColor
38-
DispatchQueue.main.async {
39-
self.networkColor = color
40-
}
41-
}
42-
4335
}

LDKNodeMonday/View Model/Profile/Peer/DisconnectViewModel.swift

+1-9
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@ import SwiftUI
1010

1111
class DisconnectViewModel: ObservableObject {
1212
@Published var disconnectViewError: MondayError?
13-
@Published var networkColor = Color.gray
1413
@Published var nodeId: PublicKey
1514

1615
init(nodeId: PublicKey) {
1716
self.nodeId = nodeId
1817
}
1918

20-
func disconnect() {
19+
func disconnect() async {
2120
do {
2221
try LightningNodeService.shared.disconnect(nodeId: self.nodeId)
2322
disconnectViewError = nil
@@ -39,11 +38,4 @@ class DisconnectViewModel: ObservableObject {
3938
}
4039
}
4140

42-
func getColor() {
43-
let color = LightningNodeService.shared.networkColor
44-
DispatchQueue.main.async {
45-
self.networkColor = color
46-
}
47-
}
48-
4941
}

LDKNodeMonday/View Model/Profile/Peer/PeerViewModel.swift

-8
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import SwiftUI
1111
class PeerViewModel: ObservableObject {
1212
@Published var address: String = ""
1313
@Published var peerViewError: MondayError?
14-
@Published var networkColor = Color.gray
1514
@Published var nodeId: PublicKey = ""
1615
@Published var isProgressViewShowing: Bool = false
1716

@@ -43,11 +42,4 @@ class PeerViewModel: ObservableObject {
4342

4443
}
4544

46-
func getColor() {
47-
let color = LightningNodeService.shared.networkColor
48-
DispatchQueue.main.async {
49-
self.networkColor = color
50-
}
51-
}
52-
5345
}

LDKNodeMonday/View Model/Profile/Peer/PeersListViewModel.swift

-8
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,10 @@ import LDKNode
99
import SwiftUI
1010

1111
class PeersListViewModel: ObservableObject {
12-
@Published var networkColor = Color.gray
1312
@Published var peers: [PeerDetails] = []
1413

1514
func listPeers() {
1615
self.peers = LightningNodeService.shared.listPeers()
1716
}
1817

19-
func getColor() {
20-
let color = LightningNodeService.shared.networkColor
21-
DispatchQueue.main.async {
22-
self.networkColor = color
23-
}
24-
}
25-
2618
}

LDKNodeMonday/View Model/Profile/NodeIDViewModel.swift renamed to LDKNodeMonday/View Model/Profile/SettingsViewModel.swift

+1-9
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ import BitcoinUI
99
import LDKNode
1010
import SwiftUI
1111

12-
class NodeIDViewModel: ObservableObject {
12+
class SettingsViewModel: ObservableObject {
1313
@AppStorage("isOnboarding") var isOnboarding: Bool?
1414
@Published var nodeIDError: MondayError?
15-
@Published var networkColor = Color.gray
1615
@Published var nodeID: String = ""
1716
@Published var network: String?
1817
@Published var esploraURL: String?
@@ -29,13 +28,6 @@ class NodeIDViewModel: ObservableObject {
2928
self.nodeID = nodeID
3029
}
3130

32-
func getColor() {
33-
let color = LightningNodeService.shared.networkColor
34-
DispatchQueue.main.async {
35-
self.networkColor = color
36-
}
37-
}
38-
3931
func stop() {
4032
do {
4133
try LightningNodeService.shared.stop()

LDKNodeMonday/View/Home/BitcoinView.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ struct BitcoinView: View {
239239
}
240240
}
241241
) {
242-
NodeIDView(viewModel: .init())
242+
SettingsView(viewModel: .init())
243243
}
244244
.alert(isPresented: $showingBitcoinViewErrorAlert) {
245245
Alert(

LDKNodeMonday/View/Home/NetworkSettingsView.swift

+2-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ struct NetworkSettingsView: View {
5353
ToolbarItem(placement: .navigationBarTrailing) {
5454
Button("Done") {
5555
dismiss()
56-
}.padding()
56+
}
57+
.padding()
5758
}
5859
}
5960
}

0 commit comments

Comments
 (0)