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

Moving stuff around

Browse source
This commit is contained in:
Philipp Heckel 2022-05-15 13:46:36 -04:00
parent e6500446c7
commit e5e440c3c5
8 changed files with 36 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Model.xcdatamodeld/Model.xcdatamodel/contents
View file

@ -1,10 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="20086" systemVersion="21E258" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
<entity name="Notification" representedClassName="Notification" syncable="YES" codeGenerationType="class">
<attribute name="message" optional="YES"/>
<attribute name="title" optional="YES"/>
</entity>
<entity name="Subscription" representedClassName="Subscription" syncable="YES" codeGenerationType="class">
<attribute name="baseUrl" optional="YES" attributeType="String"/>
<attribute name="topic" optional="YES" attributeType="String"/>
</entity>
<elements>
<element name="Subscription" positionX="-63" positionY="-18" width="128" height="59"/>
<element name="Notification" positionX="-54" positionY="9" width="128" height="59"/>
</elements>
</model>

44
ntfy.xcodeproj/project.pbxproj
View file

@ -16,11 +16,11 @@
9474F1DC282F30B500CDE4DD /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 9474F1DB282F30B500CDE4DD /* GoogleService-Info.plist */; };
9474F1E7282F3FFD00CDE4DD /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9474F1E6282F3FFD00CDE4DD /* NotificationService.swift */; };
9474F1EB282F3FFD00CDE4DD /* ntfyNSE.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 9474F1E4282F3FFD00CDE4DD /* ntfyNSE.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
9474F1F22830825600CDE4DD /* SubscriptionsList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9474F1F12830825600CDE4DD /* SubscriptionsList.swift */; };
9474F1F22830825600CDE4DD /* SubscriptionsListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9474F1F12830825600CDE4DD /* SubscriptionsListView.swift */; };
9474F1F72830830700CDE4DD /* Model.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 9474F1F52830830700CDE4DD /* Model.xcdatamodeld */; };
9474F1F92830835400CDE4DD /* DataController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9474F1F82830835400CDE4DD /* DataController.swift */; };
9474F1FB28308A2B00CDE4DD /* SubscriptionRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9474F1FA28308A2B00CDE4DD /* SubscriptionRow.swift */; };
9474F1FD2831311A00CDE4DD /* AddSubscriptionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9474F1FC2831311A00CDE4DD /* AddSubscriptionView.swift */; };
9474F1F92830835400CDE4DD /* Store.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9474F1F82830835400CDE4DD /* Store.swift */; };
9474F1FB28308A2B00CDE4DD /* SubscriptionRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9474F1FA28308A2B00CDE4DD /* SubscriptionRowView.swift */; };
9474F1FD2831311A00CDE4DD /* SubscriptionAddView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9474F1FC2831311A00CDE4DD /* SubscriptionAddView.swift */; };
9474F1FF28316ACE00CDE4DD /* Subscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9474F1FE28316ACE00CDE4DD /* Subscription.swift */; };
9474F20128316D1100CDE4DD /* Messenger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9474F20028316D1100CDE4DD /* Messenger.swift */; };
/* End PBXBuildFile section */
@ -62,11 +62,11 @@
9474F1E4282F3FFD00CDE4DD /* ntfyNSE.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = ntfyNSE.appex; sourceTree = BUILT_PRODUCTS_DIR; };
9474F1E6282F3FFD00CDE4DD /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = "<group>"; };
9474F1E8282F3FFD00CDE4DD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
9474F1F12830825600CDE4DD /* SubscriptionsList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SubscriptionsList.swift; sourceTree = "<group>"; };
9474F1F12830825600CDE4DD /* SubscriptionsListView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SubscriptionsListView.swift; sourceTree = "<group>"; };
9474F1F62830830700CDE4DD /* Model.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model.xcdatamodel; sourceTree = "<group>"; };
9474F1F82830835400CDE4DD /* DataController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataController.swift; sourceTree = "<group>"; };
9474F1FA28308A2B00CDE4DD /* SubscriptionRow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SubscriptionRow.swift; sourceTree = "<group>"; };
9474F1FC2831311A00CDE4DD /* AddSubscriptionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddSubscriptionView.swift; sourceTree = "<group>"; };
9474F1F82830835400CDE4DD /* Store.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Store.swift; sourceTree = "<group>"; };
9474F1FA28308A2B00CDE4DD /* SubscriptionRowView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SubscriptionRowView.swift; sourceTree = "<group>"; };
9474F1FC2831311A00CDE4DD /* SubscriptionAddView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SubscriptionAddView.swift; sourceTree = "<group>"; };
9474F1FE28316ACE00CDE4DD /* Subscription.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Subscription.swift; sourceTree = "<group>"; };
9474F20028316D1100CDE4DD /* Messenger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Messenger.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
@ -113,17 +113,16 @@
9474F1BF282F2AA700CDE4DD /* ntfy */ = {
isa = PBXGroup;
children = (
9474F202283170F000CDE4DD /* Views */,
9474F1C0282F2AA700CDE4DD /* App.swift */,
9474F1D1282F2D2C00CDE4DD /* AppDelegate.swift */,
9474F1C4282F2AA800CDE4DD /* Assets.xcassets */,
9474F1F82830835400CDE4DD /* DataController.swift */,
9474F1DB282F30B500CDE4DD /* GoogleService-Info.plist */,
9474F1D6282F2FF700CDE4DD /* Info.plist */,
9474F20028316D1100CDE4DD /* Messenger.swift */,
9474F1D5282F2FED00CDE4DD /* ntfy.entitlements */,
9474F2032831725A00CDE4DD /* Persistence */,
9474F1C6282F2AA800CDE4DD /* Preview Content */,
9474F1FE28316ACE00CDE4DD /* Subscription.swift */,
9474F202283170F000CDE4DD /* Views */,
);
path = ntfy;
sourceTree = "<group>";
@ -155,14 +154,23 @@
9474F202283170F000CDE4DD /* Views */ = {
isa = PBXGroup;
children = (
9474F1F12830825600CDE4DD /* SubscriptionsList.swift */,
9474F1FA28308A2B00CDE4DD /* SubscriptionRow.swift */,
9474F1C2282F2AA700CDE4DD /* ContentView.swift */,
9474F1FC2831311A00CDE4DD /* AddSubscriptionView.swift */,
9474F1FC2831311A00CDE4DD /* SubscriptionAddView.swift */,
9474F1FA28308A2B00CDE4DD /* SubscriptionRowView.swift */,
9474F1F12830825600CDE4DD /* SubscriptionsListView.swift */,
);
path = Views;
sourceTree = "<group>";
};
9474F2032831725A00CDE4DD /* Persistence */ = {
isa = PBXGroup;
children = (
9474F1FE28316ACE00CDE4DD /* Subscription.swift */,
9474F1F82830835400CDE4DD /* Store.swift */,
);
path = Persistence;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@ -270,13 +278,13 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
9474F1F92830835400CDE4DD /* DataController.swift in Sources */,
9474F1F92830835400CDE4DD /* Store.swift in Sources */,
9474F20128316D1100CDE4DD /* Messenger.swift in Sources */,
9474F1D2282F2D2C00CDE4DD /* AppDelegate.swift in Sources */,
9474F1C3282F2AA700CDE4DD /* ContentView.swift in Sources */,
9474F1FB28308A2B00CDE4DD /* SubscriptionRow.swift in Sources */,
9474F1F22830825600CDE4DD /* SubscriptionsList.swift in Sources */,
9474F1FD2831311A00CDE4DD /* AddSubscriptionView.swift in Sources */,
9474F1FB28308A2B00CDE4DD /* SubscriptionRowView.swift in Sources */,
9474F1F22830825600CDE4DD /* SubscriptionsListView.swift in Sources */,
9474F1FD2831311A00CDE4DD /* SubscriptionAddView.swift in Sources */,
9474F1FF28316ACE00CDE4DD /* Subscription.swift in Sources */,
9474F1C1282F2AA700CDE4DD /* App.swift in Sources */,
9474F1F72830830700CDE4DD /* Model.xcdatamodeld in Sources */,

2
ntfy/App.swift
View file

@ -12,7 +12,7 @@ import Firebase
@main
struct ntfyApp: App {
@UIApplicationDelegateAdaptor(AppDelegate.self) var delegate: AppDelegate
@StateObject private var dataController = DataController()
@StateObject private var dataController = Store()
init() {
FirebaseApp.configure()

2
ntfy/DataController.swift → ntfy/Persistence/Store.swift
View file

@ -8,7 +8,7 @@
import Foundation
import CoreData
class DataController: ObservableObject {
class Store: ObservableObject {
let container = NSPersistentContainer(name: "Model")
init() {

0
ntfy/Subscription.swift → ntfy/Persistence/Subscription.swift
View file

4
ntfy/Views/AddSubscriptionView.swift → ntfy/Views/SubscriptionAddView.swift
View file

@ -8,7 +8,7 @@
import SwiftUI
import FirebaseMessaging
struct AddSubscriptionView: View {
struct SubscriptionAddView: View {
@Environment(\.managedObjectContext) var context
@Environment(\.presentationMode) var presentationMode: Binding<PresentationMode>
@State private var topic: String = ""
@ -20,7 +20,7 @@ struct AddSubscriptionView: View {
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. server_alerts", text: $topic)
TextField("Topic name, e.g. phil_alerts", text: $topic)
.textInputAutocapitalization(.never)
}
}

0
ntfy/Views/SubscriptionRow.swift → ntfy/Views/SubscriptionRowView.swift
View file

2
ntfy/Views/SubscriptionsList.swift → ntfy/Views/SubscriptionsListView.swift
View file

@ -44,7 +44,7 @@ struct SubscriptionsList: View {
.toolbar {
ToolbarItem(placement: .navigationBarTrailing) {
NavigationLink(
destination: AddSubscriptionView()
destination: SubscriptionAddView()
) {
Image(systemName: "plus")
}