centralcloud/oncall-mobile-ios
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show SubscriptionAddView via a sheet

Browse source
This commit is contained in:
Callum Yarnold 2022-05-25 16:39:26 +01:00
parent 924145dcec
commit 3728d3ebe0
No known key found for this signature in database
GPG key ID: 1B309601199B0473
2 changed files with 39 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
ntfy/Views/SubscriptionAddView.swift
View file

@ -7,32 +7,37 @@ struct SubscriptionAddView: View {
@Environment(\.presentationMode) var presentationMode: Binding<PresentationMode>
@EnvironmentObject private var store: Store
@State private var topic: String = ""
@Binding var isShowing: Bool
private var subscriptionManager: SubscriptionManager {
return SubscriptionManager(store: store)
}
var body: some View {
VStack {
Form {
Section(
header: Text("Topic name"),
footer: Text("Topics may not be password protected, so choose a name that's not easy to guess. Once subscribed, you can PUT/POST notifications")
) {
TextField("Topic name, e.g. phil_alerts", text: $topic)
.disableAutocapitalization()
.disableAutocorrection(true)
}
}
.navigationBarTitleDisplayMode(.inline)
.toolbar {
ToolbarItem(placement: .navigationBarTrailing) {
NavigationView {
VStack {
Form {
Section(
header: Text("Topic name"),
footer: Text("Topics may not be password protected, so choose a name that's not easy to guess. Once subscribed, you can PUT/POST notifications")
) {
TextField("Topic name, e.g. phil_alerts", text: $topic)
.disableAutocapitalization()
.disableAutocorrection(true)
}
Button(action: subscribeAction) {
Text("Subscribe")
}
.disabled(!isValid(topic: topic))
}
.toolbar {
ToolbarItem(placement: .navigationBarTrailing) {
CloseButton(isShowing: $isShowing)
}
}
}
.navigationTitle("Add Subscription")
}
}
@ -52,3 +57,16 @@ struct SubscriptionAddView: View {
presentationMode.wrappedValue.dismiss()
}
}
struct CloseButton: View {
@Binding var isShowing: Bool
var body: some View {
Button(action: {
isShowing = false
}, label: {
Image(systemName: "xmark")
.font(.headline)
})
}
}

8
ntfy/Views/SubscriptionListView.swift
View file

@ -8,6 +8,7 @@ struct SubscriptionListView: View {
@EnvironmentObject private var store: Store
@FetchRequest(sortDescriptors: [NSSortDescriptor(keyPath: \Subscription.topic, ascending: true)]) var subscriptions: FetchedResults<Subscription>
@State private var showingAddSubscriptionView = false
private var subscriptionManager: SubscriptionManager {
return SubscriptionManager(store: store)
@ -50,7 +51,9 @@ struct SubscriptionListView: View {
.navigationTitle("Subscribed topics")
.toolbar {
ToolbarItem(placement: .navigationBarTrailing) {
NavigationLink(destination: SubscriptionAddView()) {
Button {
self.showingAddSubscriptionView = true
} label: {
Image(systemName: "plus")
}
}
@ -69,6 +72,9 @@ struct SubscriptionListView: View {
.padding(40)
}
})
.sheet(isPresented: $showingAddSubscriptionView) {
SubscriptionAddView(isShowing: $showingAddSubscriptionView)
}
}
}